托书调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -1558,7 +1558,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 			 	li.setPreDeliveryDate1(sf.format(li.getPreDeliveryDate()));
 				 orderQuantity = orderQuantity.add(li.getOrderQuantity());
 				 BigDecimal p = new BigDecimal(li.getSalesUnitPrice()).multiply(li.getOrderQuantity());
-				 li.setPrice(p);
+				 li.setPrice(p.setScale(4,BigDecimal.ROUND_DOWN));
 				 price = price.add(p);
 
 				 Field[] fieldsList = li.getClass().getDeclaredFields();
@@ -1570,7 +1570,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 				 listMap.add(mapList);
 			 }
 			 map.put("orderQuantity",orderQuantity);
-			 map.put("price",price);
+			 map.put("price",price.setScale(4,BigDecimal.ROUND_DOWN));
 			 map.put("item", listMap);
 
 			 //sheet.createFreezePane(0, 1, 0, 1);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/mapper/xml/SyShippingDetailsMapper.xml

@@ -69,7 +69,7 @@ a.end_customer) as endCustomer,
     select t.* from(select b.is_reference as isReference,a.id as id,GROUP_CONCAT(b.id) as itemIds,a.document_no as documentNo,a.document_date as documentDate,b.order_number as orderNumber,a.push_state,b.submit_status as submitStatus,
     b.customer_abbreviation as customerAbbreviation,b.sales_department as salesDepartment,b.salesman as salesman,a.customer as customer,b.specification_and_model as specificationAndModel,
     b.small_po as smallPo,b.pack_id as packId,b.pre_delivery_date as preDeliveryDate,b.order_date as orderDate,b.inventory_ccode as inventoryCcode,
-    sum(b.shipment_quantity) as shipmentQuantity,b.customs_declaration_unit_price as customsDeclarationUnitPrice,sum(b.order_quantity) as orderQuantity,
+    sum(b.shipment_quantity) as shipmentQuantity,b.customs_declaration_unit_price as customsDeclarationUnitPrice,round(sum(b.order_quantity),4) as orderQuantity,
     b.is_tc as isTc,b.distribution_point as distributionPoint,b.item_number as itemNumber,b.business_type_text as businessTypeText,
     b.inventory_name as inventoryName,b.sales_unit_price as salesUnitPrice,b.order_remaining_quantity as orderRemainingQuantity,
     b.pur_or_sub_order as purOrSubOrder,a.order_type as orderType,b.factory_unit_price as factoryUnitPrice,b.third_party as thirdParty,b.customer_order as customerOrder,

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -451,28 +451,35 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 	  	  //订单号
 		  if(oConvertUtils.isNotEmpty(syPackingList.getOrderNumber())){
 			  queryWrapper.like("b.order_number",syPackingList.getOrderNumber());
+			  boo =true;
 		  }
 		  //外销发票号
 		  if(oConvertUtils.isNotEmpty(syPackingList.getExportInvoiceNo())){
 			  queryWrapper.eq("a.export_invoice_no",syPackingList.getExportInvoiceNo());
+			  boo =true;
 		  }
 		  //集装箱号
 		  if(oConvertUtils.isNotEmpty(syPackingList.getContainerNumber())){
 			  queryWrapper.eq("a.container_number",syPackingList.getContainerNumber());
+			  boo =true;
 		  }
 		  //面料还是辅料
-		  if(oConvertUtils.isNotEmpty(type)){
-		  	if(type.equals("面料")){
-				queryWrapper.isNull("b.u8_Pid");
-			}else{
-				queryWrapper.isNotNull("b.u8_Pid");
-			}
-		  }
+//		  if(oConvertUtils.isNotEmpty(type)){
+//		  	if(type.equals("面料")){
+//				queryWrapper.isNull("b.u8_Pid");
+//			}else{
+//				queryWrapper.isNotNull("b.u8_Pid");
+//			}
+//		  }
 		  queryWrapper.eq("a.del_flag",0).eq("b.del_flag",0).eq("a.status",1);
 		  queryWrapper.eq("a.is_Reference",0);
 		  queryWrapper.orderByDesc("a.document_No");
 		  queryWrapper.groupBy("a.id,b.sy_shipping_details_item_id");
+		  if(boo==true){
+		  pageList = syShippingOrderService.queryFabric(page1,queryWrapper);
+		  }else{
 		  pageList = syShippingOrderService.queryFabric(page,queryWrapper);
+		  }
 
 	  }
 	  result.setSuccess(true);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/mapper/xml/SyShippingOrderMapper.xml

@@ -109,7 +109,7 @@ case when a.ready_fabric != '成衣' then sum(a.net_weight) else a.net_weight en
 case when a.ready_fabric != '成衣' then a.volume else a.volume end as volume,round(sum(a.total_price),2) as totalPrice,
 a.distribution_point as distributionPoint, a.container_code as containerCode, a.container_number as containerNumber, a.unit_price as unitPrice, a.pre_shipment_date as preShipmentDate,
 a.salesman, a.operating_department as operatingDepartment, a.purchase_outsourcing_order_no as purOrSubOrder, a.outsourcing_factory_for_procurement as outsourcingFactoryForProcurement,
- a.memo, a.sort, a.ready_fabric as readyFabric, a.tailoring_fabric_id as tailoringFabricId, GROUP_CONCAT(a.tailoring_fabric_item_id) as tailoringFabricItemId,a.client_abbreviation as clientAbbreviation
+ a.memo, a.sort, a.ready_fabric as readyFabric, GROUP_CONCAT(a.tailoring_fabric_id) as tailoringFabricId, GROUP_CONCAT(a.tailoring_fabric_item_id) as tailoringFabricItemId,a.client_abbreviation as clientAbbreviation
  FROM sy_shipping_order_item a
         <if test='type == "成衣"'>
             left join sy_packing_list_tailoring_item c

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/service/impl/SyShippingOrderServiceImpl.java

@@ -385,17 +385,26 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
             if(li.getReadyFabric().equals("面料") || li.getReadyFabric().equals("辅料")){
 
                 //查询预装箱但面料数据
-                SyPackingListFabric syPackingListFabric = syPackingListFabricService.getById(li.getTailoringFabricId());
-                if(oConvertUtils.isEmpty(syPackingListFabric)){
+                List<String> tailoringFabricIdList = new ArrayList<>();
+                String taID[]=li.getTailoringFabricId().split(",");
+                for(String s:taID){
+                    tailoringFabricIdList.add(s);
+                }
+                QueryWrapper<SyPackingListFabric> queryWrapper = new QueryWrapper<>();
+                queryWrapper.in("id",tailoringFabricIdList);
+                List<SyPackingListFabric> syPackingListFabric = syPackingListFabricService.list(queryWrapper);
+                if(syPackingListFabric.size()==0){
                     throw new JeecgBootException("没有查询到装箱单面料数据！");
                 }
-                //回写预装箱-面料是否被参照，托书号
-                syPackingListFabric.setIsReference(0);
-                syPackingListFabric.setShippingOrderNumber("");
-                //syPackingListFabric.setExportInvoiceNo("");
-                //syPackingListFabric.setContainerCode("");
-               // syPackingListFabric.setContainerNumber("");
-                syPackingListFabricService.updateById(syPackingListFabric);
+                for(SyPackingListFabric str:syPackingListFabric) {
+                    //回写预装箱-面料是否被参照，托书号
+                    str.setIsReference(0);
+                    str.setShippingOrderNumber("");
+                    //syPackingListFabric.setExportInvoiceNo("");
+                    //syPackingListFabric.setContainerCode("");
+                    // syPackingListFabric.setContainerNumber("");
+                    syPackingListFabricService.updateById(str);
+                }
 
             }else{//成衣
                 //回写预装箱-成衣是否被参照，托书号