north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
@@ -210,6 +210,9 @@ <style scoped> #child{ margin-top: 20px; } h1,h3{ left:0; right:0; @@ -222,7 +225,6 @@ } h3{ font-size: 1.2rem; font-weight: bolder; } north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel1.vue
@@ -37,7 +37,6 @@ onMounted(() => { request.post(`/processCard/getSelectPrintCustomLabel/${type}/${lableType}`, data.value).then((res) => { if (res.code == 200) { console.log(res.data.data) produceList.value = deepClone(res.data.title) list.value = deepClone(res.data.data) const data = produceList.value[0].value north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue
@@ -37,7 +37,6 @@ onMounted(() => { request.post(`/processCard/getSelectPrintCustomLabel/${type}/${lableType}`, data.value).then((res) => { if (res.code == 200) { console.log(res.data.data) produceList.value = deepClone(res.data.title) list.value = deepClone(res.data.data) const data = produceList.value[0].value north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryPrinting.vue
@@ -238,7 +238,6 @@ border: 1px solid #d3dce6; border-collapse: collapse; font-size: 15px; font-weight: bold; } .day-in td{ text-align: center; @@ -258,8 +257,7 @@ display: none; }*/ .bottom{ font-size: 10px; font-weight: bold; font-size: 12px; } north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
@@ -184,9 +184,9 @@ deliverydetailsum=0; } System.out.println("订单总数:" + ordersum + "订单库存数:" + orderNumberdsum + "准备出库数量" + /*System.out.println("订单总数:" + ordersum + "订单库存数:" + orderNumberdsum + "准备出库数量" + orderDetail.getWarehouseNum()+ "发货数量" + orderDetail.getDeliveryDetail().getQuantity()+ "发货总数" + deliverysum+ "已发数量" + deliverydetailsum); deliverysum+ "已发数量" + deliverydetailsum);*/ if (finishedGoodsInventorycount > 0) { if(orderDetail.getWarehouseNum()>=orderDetail.getDeliveryDetail().getQuantity()){ //修改库存表库存数量 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -577,11 +577,11 @@ ifnull(od.processing_note,'') as processing_note from sd.order as o left join sd.order_detail as od on o.order_id = od.order_id left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number left join pp.flow_card as fc on o.order_id = fc.order_id and od.order_number = fc.order_number od.order_number = fc.order_number and fc.technology_number=ogd.technology_number left join sd.product pt on pt.id=od.product_id left join sd.customer c on c.id=o.customer_id left join sd.order_glass_detail ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number where fc.process_id = #{processId} and fc.technology_number=#{technologyNumber} group by od.order_number,od.width,od.height