预托书，托书调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/controller/SyLetterDepositController.java

@@ -30,6 +30,8 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetails;
 import org.jeecg.modules.documents.shippingDetails.entity.VO.OrderDataVo;
 import org.jeecg.modules.spapl.entity.SyPreAssembledPackingList;
+import org.jeecg.modules.splt.entity.SyPackingListTailoringItem;
+import org.jeecg.modules.splt.service.impl.SyPackingListTailoringItemServiceImpl;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -62,6 +64,8 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 	private ISyLetterDepositItemService syLetterDepositItemService;
 	@Autowired
 	private SyLetterDepositMapper syLetterDepositMapper;
+	 @Autowired
+	 private SyPackingListTailoringItemServiceImpl syPackingListTailoringItemService;
 	
 	/**
 	 * 分页列表查询
@@ -229,6 +233,11 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 	@DeleteMapping(value = "/delete")
 	public Result<Integer> delete(@RequestParam(name="id",required=true) String id) {
 		Result<Integer> result = new Result<>();
+
+
+		//预装箱单ID集合
+		List<String> assembledList = new ArrayList<>();
+
 		try{
 		//判断ID是否为空
 		if(oConvertUtils.isEmpty(id)){
@@ -236,6 +245,28 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 			result.setMessage("ID为空，删除失败！");
 			return result;
 		}
+		//查询预托书子表
+			QueryWrapper<SyLetterDepositItem> queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq("sy_letter_deposit_id",id).eq("del_flag",0);
+			List<SyLetterDepositItem> list = syLetterDepositItemService.list(queryWrapper);
+
+			//判断预装箱单下游有没有装箱单数据
+			//查询装箱单子表数据
+			String assIds = list.get(0).getPreIds();
+			String assSplit[] = assIds.split(",");
+			for(String str:assSplit){
+				assembledList.add(str);
+			}
+			//查询是否游下游装箱单sy_packing_list_tailoring_item
+			QueryWrapper<SyPackingListTailoringItem> queryWrapper1 = new QueryWrapper<>();
+			queryWrapper1.in("sy_Pre_Assembled_Packing_List_Item_Id",assembledList).eq("del_flag",0);
+			List<SyPackingListTailoringItem> itemList = syPackingListTailoringItemService.list(queryWrapper1);
+			if(itemList.size() !=0 ){
+				result.setSuccess(false);
+				result.setMessage("该单据参照的预装箱单下游装箱单有单据，无法删除");
+				return result;
+
+			}
 		//判断是否已提交
 		SyLetterDeposit entity = syLetterDepositService.getById(id);
 		if(entity.getTheDocumentsState().equals("1")){

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

@@ -288,14 +288,25 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 
 	  IPage<SyPackingList> pageList = new Page<>();
 	  Page<SyPackingList> page = new Page<SyPackingList>(pageNo, pageSize);
+	  String ordernumber = syPackingList.getOrderNumber();
+	  syPackingList.setOrderNumber(null);
+
+	  QueryWrapper<SyPackingList> queryWrapper = QueryGenerator.initQueryWrapper(syPackingList,request.getParameterMap());
+
+
 
-	  QueryWrapper<SyPackingList> queryWrapper = QueryGenerator.initQueryWrapper(syPackingList, request.getParameterMap());
 	  if(tailoringOrFabric.equals("0")){ //查成衣
-			  queryWrapper.eq("a.del_flag",0).eq("b.del_flag",0).eq("a.the_documents_state",1).groupBy("b.group_id");
+		  if(oConvertUtils.isNotEmpty(ordernumber)){
+			  queryWrapper.like("a.order_number",ordernumber);
+		  }
+			  queryWrapper.eq("a.del_flag",0).eq("b.del_flag",0).eq("a.status",1).groupBy("b.group_id");
 			  queryWrapper.groupBy("a.document_No");
 		  pageList = syShippingOrderService.queryTailoring(page,queryWrapper);
 
 	  }else{//查面料
+		  if(oConvertUtils.isNotEmpty(ordernumber)){
+			  queryWrapper.like("b.order_number",ordernumber);
+		  }
 		  queryWrapper.eq("a.del_flag",0).eq("b.del_flag",0).eq("a.status",1);
 		  queryWrapper.groupBy("a.document_No");
 		  pageList = syShippingOrderService.queryFabric(page,queryWrapper);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/entity/VO/SyPackingList.java

@@ -88,6 +88,7 @@ public class SyPackingList {
     private String orderNumber;
     @ApiModelProperty(value = "业务员")
     private String salesman;
-
+    @ApiModelProperty(value = "总价")
+    private BigDecimal totalPrice;
 
 }

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

@@ -19,10 +19,10 @@
 <!--    查询装箱单-成衣-->
   <select id="queryTailoring" resultType="org.jeecg.modules.documents.syShippingOrder.entity.VO.SyPackingList">
 
-    select a.id as id ,GROUP_CONCAT(b.id) as itemId, a.document_No as documentNo,a.order_number as orderNumber,a.depositary_receipt_no as depositaryReceiptNo,
+    select a.id as id ,GROUP_CONCAT(b.id) as itemId, a.document_No as documentNo,a.depositary_receipt_no as depositaryReceiptNo,
      a.item_number as itemNumber,b.inventory_name as inventoryName,b.distribution_point as distributionPoint,a.customer_abbreviation as customerAbbreviation,
      b.item_code as itemCode,b.starting_box_number as startingBoxNumber,b.end_case_number as endCaseNumber,b.hod as preDeliveryDate,b.small_Po as smallPo,
-     b.colour as colour,b.pieces_box as piecesBox,b.box_number as boxNumber,b.total as total,b.outer_box_length as outerBoxLength,a.customer as customer,b.order_Number as orderNumber,
+     b.colour as colour,b.pieces_box as piecesBox,b.box_number as boxNumber,b.total as total,b.outer_box_length as outerBoxLength,a.customer as customer,a.order_number as orderNumber,
      b.outer_box_width as outerBoxWidth,b.outer_box_height as outerBoxHeight,sum(b.total_volume) as totalVolume,sum(b.total_net_weight) as totalNetWeight,b.spur_Or_Sub_Order as purOrSubOrder,
      sum(b.total_gross_weight) as totalGrossWeight,'成衣' as readyFabric,a.memo as memo,b.salesman as salesman,b.factory_Unit_Price as factoryUnitPrice,sum(b.total_price) as totalPrice,
      sum(b.plan_Quantity) as planQuantity,sum(b.actual_Packing_Qty) as actualPackingQty,a.container_code as containerCode,a.container_number as containerNumber

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

@@ -146,6 +146,17 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setContainerNumber(li.getContainerNumber());//集装箱号
                         syShippingOrderItem.setTailoringFabricId(li.getTailoringFabricId());//成衣或者面料主表ID
                         syShippingOrderItem.setTailoringFabricItemId(li.getTailoringFabricItemId());//成衣或者面料子表ID
+                        syShippingOrderItem.setSmailPo(itemli.getSmallPo());
+                        syShippingOrderItem.setGrossWeight(itemli.getGrossWeight());
+                        syShippingOrderItem.setNetWeight(itemli.getNetWeight());
+                        syShippingOrderItem.setVolume(itemli.getTotalVolume());
+                        syShippingOrderItem.setDistributionPoint(itemli.getDistributionPoint());
+                        syShippingOrderItem.setUnitPrice(itemli.getPrice());
+                        syShippingOrderItem.setPreShipmentDate(itemli.getPreDeliveryDate());
+                        syShippingOrderItem.setSalesman(itemli.getSalesman());
+                        syShippingOrderItem.setOperatingDepartment(itemli.getSalesDepartment());
+                        syShippingOrderItem.setPurchaseOutsourcingOrderNo(itemli.getPurOrSubOrder());
+                        syShippingOrderItem.setPkOrg(itemli.getPkOrg());
 
                          itemList.add(syShippingOrderItem);
 
@@ -174,27 +185,27 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     //转换数据
                     for(SyPackingListTailoringItem lit:itemslist){
                         SyShippingOrderItem syShippingOrderItem =  new SyShippingOrderItem();
-
+                        syShippingOrderItem.setNumber(lit.getPlanQuantity());//数量
+                        syShippingOrderItem.setBoxNumber(lit.getBoxNumber());//箱数
                         syShippingOrderItem.setId(oConvertUtils.id());
                         syShippingOrderItem.setSyShippingOrderItemId(id);
                         syShippingOrderItem.setDelFlag("0");
-                      //  syShippingOrderItem.setNumber(lit.getInventoryQuantity());//数量
                         syShippingOrderItem.setSmailPo(lit.getSmallPo());
                         syShippingOrderItem.setBoxNumber(lit.getBoxNumber());
                         syShippingOrderItem.setGrossWeight(lit.getGrossWeight());
                         syShippingOrderItem.setNetWeight(lit.getNetWeight());
-                       // syShippingOrderItem.setVolume(lit.get)
+                        syShippingOrderItem.setVolume(lit.getTotalVolume());
                         syShippingOrderItem.setDistributionPoint(lit.getDistributionPoint());
-                       // syShippingOrderItem.setContainerCode(lit.getCom)
+                        syShippingOrderItem.setContainerCode(li.getContainerCode());
+                        syShippingOrderItem.setContainerNumber(li.getContainerNumber());//集装箱号
                         syShippingOrderItem.setUnitPrice(lit.getUnitPrice());
-                        //syShippingOrderItem.setPreShipmentDate()
+                        syShippingOrderItem.setPreShipmentDate(lit.getHod());
                         syShippingOrderItem.setReadyFabric("成衣");//成衣或者面料
                         syShippingOrderItem.setContainerCode(li.getContainerCode());//集装箱代号
                         syShippingOrderItem.setContainerNumber(li.getContainerNumber());//集装箱号
                         syShippingOrderItem.setTailoringFabricId(li.getTailoringFabricId());//成衣或者面料主表ID
                         syShippingOrderItem.setTailoringFabricItemId(li.getTailoringFabricItemId());//成衣或者面料子表ID
 
-
                         itemList.add(syShippingOrderItem);
 
                     }