托书调整

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

@@ -2,6 +2,7 @@ package org.jeecg.modules.documents.letterDeposit.controller;
 
 
 import java.lang.reflect.Field;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -102,7 +103,7 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 			Page<SyLetterDeposit> page = new Page<SyLetterDeposit>(pageNo, pageSize);
 			//客户简称
 			if(oConvertUtils.isNotEmpty(syLetterDeposit.getClientAbbreviation())){
-				queryWrapper.eq("b.client_abbreviation",syLetterDeposit.getClientAbbreviation().trim());
+				queryWrapper.like("b.client_abbreviation",syLetterDeposit.getClientAbbreviation().trim());
 			}
 			//制单人
 			if(oConvertUtils.isNotEmpty(syLetterDeposit.getCreateBy())){
@@ -110,11 +111,11 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 			}
 			//小PO
 			if(oConvertUtils.isNotEmpty(syLetterDeposit.getSmallPo())){
-				queryWrapper.eq("b.small_po",syLetterDeposit.getSmallPo().trim());
+				queryWrapper.like("b.small_po",syLetterDeposit.getSmallPo().trim());
 			}
 			//预托书号
 			if(oConvertUtils.isNotEmpty(syLetterDeposit.getDepositaryReceiptNo())){
-				queryWrapper.eq("a.depositary_receipt_no",syLetterDeposit.getDepositaryReceiptNo().trim());
+				queryWrapper.like("a.depositary_receipt_no",syLetterDeposit.getDepositaryReceiptNo().trim());
 			}
 			//托书日期
 			if(oConvertUtils.isNotEmpty(syLetterDeposit.getShippingOrderDate())){
@@ -535,6 +536,17 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 		 SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd"); // 月日年
 		 SimpleDateFormat sdf1 = new SimpleDateFormat("MMM'.'dd'th,' yyyy", Locale.UK); // 月日年
 
+		 //总毛重
+		 BigDecimal totalGrossWeight = BigDecimal.ZERO;
+		 //总净重
+		 BigDecimal totalNetweight = BigDecimal.ZERO;
+		 //总数量
+		 BigDecimal tatolNumber = BigDecimal.ZERO;
+		 //总件数
+		 BigDecimal totalBoxNumber = BigDecimal.ZERO;
+		 //总体积
+		 BigDecimal tatolVolume = BigDecimal.ZERO;
+
 		 TopinYin py = new TopinYin();
 		 try {
 			 //查询主表信息
@@ -543,17 +555,18 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 			 entity.setLastDate(sf.format(entity.getLatestDateOfShipment()));
 			 entity.setTheDate(sf.format(entity.getTheFinalShippingDate()));
 
-			 //转map
-			 Field[] fields = entity.getClass().getDeclaredFields();
-			 for (Field field : fields) {
-				 field.setAccessible(true);
-				 map.put(field.getName(), field.get(entity));
-			 }
 
 			 //查询子表
 			 List<SyLetterDepositItem> list = syLetterDepositMapper.printItem(id);
 			 //集合转map
 			 for(SyLetterDepositItem li:list){
+
+				 totalGrossWeight = totalGrossWeight.add(li.getTotalGrossWeight());
+				 totalNetweight = totalNetweight.add(li.getTotalNetWeight());
+				 tatolNumber  = tatolNumber.add(li.getTotal());
+				 totalBoxNumber = totalBoxNumber.add(li.getBoxNumber());
+				 tatolVolume = tatolVolume.add(li.getTotalVolume());
+
 				 Field[] fieldsList = li.getClass().getDeclaredFields();
 				 Map<String, Object> mapList = new HashMap<String, Object>();
 				 for (Field field : fieldsList) {
@@ -562,6 +575,25 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 				 }
 				 listMap.add(mapList);
 			 }
+
+			 //总毛重
+			 entity.setTotalGrossWeight(totalGrossWeight);
+			 //总净重
+			 entity.setTotalNetweight(totalNetweight);
+			 //总数量
+			 entity.setTotal(tatolNumber);
+			 //总件数
+			 entity.setTotalBoxNumber(totalBoxNumber);
+			 //总体积
+			 entity.setTotalVolume(tatolVolume);
+
+			 //主表转map
+			 Field[] fields = entity.getClass().getDeclaredFields();
+			 for (Field field : fields) {
+				 field.setAccessible(true);
+				 map.put(field.getName(), field.get(entity));
+			 }
+
 			 map.put("item", listMap);
 
 			 TemplateExportParams params = new TemplateExportParams("D:\\单证模板\\预托书数据.xlsx");

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/entity/SyLetterDeposit.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.documents.letterDeposit.entity;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -255,4 +256,14 @@ public class SyLetterDeposit {
 	//打印使用的最终船期
 	@TableField(exist = false)
 	private String theDate;
+
+	//总净重
+	@TableField(exist = false)
+	private BigDecimal totalNetweight;
+	//总件数
+	@TableField(exist = false)
+	private BigDecimal totalBoxNumber;
+    //总数量
+	@TableField(exist = false)
+	private BigDecimal total;
 }

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

@@ -749,7 +749,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 
 	  Page<OrderDataVo> page = new Page<OrderDataVo>(1, -1);
 	  if (oConvertUtils.isNotEmpty(itemNumber)) {
-		  queryWrapper.eq("b.item_number", itemNumber);
+		  queryWrapper.like("b.item_number", itemNumber);
 	  }
 	  if (oConvertUtils.isNotEmpty(account)) {
 		  queryWrapper.eq("a.account", account);
@@ -759,7 +759,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 		  queryWrapper.le("a.order_date", endDeliveryDate);
 	  }
 	  if (oConvertUtils.isNotEmpty(salesman)) {
-		  queryWrapper.eq("a.salesman", salesman);
+		  queryWrapper.like("a.salesman", salesman);
 	  }
 	  if (oConvertUtils.isNotEmpty(customerName)) {
 		  queryWrapper.like("a.customer_name", customerName);

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

@@ -206,6 +206,10 @@ public class SyShippingOrderItem {
 	@ApiModelProperty(value = "单位")
 	private String masterMetering;
 
+	@Excel(name = "报关单价", width = 15)
+	@ApiModelProperty(value = "报关单价")
+	private BigDecimal declarationUnitPrice;
+
 
 	/**
 	 * 下面是打印用的字段

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

@@ -83,7 +83,7 @@ d.terms_of_deliveryvalue as termsOfDeliveryvalue
 
     <select id="queryItem" resultType="org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem">
 SELECT GROUP_CONCAT(id) as id, sy_shipping_order_item_id as syShippingOrderItemId, english_name as englishName, style_number as styleNumber, smail_po as smailPo,create_by as createBy,
-sum(number) as number, box_number as boxNumber, sum(gross_weight) as grossWeight, sum(net_weight) as netWeight, sum(volume) as volume,sum(total_price) as totalPrice,
+sum(number) as number, box_number as boxNumber, sum(gross_weight) as grossWeight, sum(net_weight) as netWeight, case when ready_fabric != '成衣' then volume else sum(volume) end as volume,sum(total_price) as totalPrice,
 distribution_point as distributionPoint, container_code as containerCode, container_number as containerNumber, unit_price as unitPrice, pre_shipment_date as preShipmentDate,
 salesman, operating_department as operatingDepartment, purchase_outsourcing_order_no as purOrSubOrder, outsourcing_factory_for_procurement as outsourcingFactoryForProcurement,
  memo, sort, ready_fabric as readyFabric, tailoring_fabric_id as tailoringFabricId, GROUP_CONCAT(tailoring_fabric_item_id) as tailoringFabricItemId,client_abbreviation as clientAbbreviation

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

@@ -135,6 +135,8 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
         List<SyShippingOrderItem> list = syShippingOrder.getSyShippingOrderItemList();
         if(list.size()!=0){
             for(SyShippingOrderItem li:list){
+                //分组ID
+                String groupid = oConvertUtils.id();
                 //合计箱数
                 totalBox = totalBox+li.getBoxNumber().intValue();
                 //装箱单子表ID集合
@@ -176,6 +178,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                             syShippingOrderItem.setReadyFabric("辅料");
                             syShippingOrderItem.setBoxNumber(itemli.getRolls());
                         }
+                        syShippingOrderItem.setGroupId(groupid);//分组ID
                         syShippingOrderItem.setContainerCode(li.getContainerCode());//集装箱代号
                         syShippingOrderItem.setContainerNumber(li.getContainerNumber());//集装箱号
                         syShippingOrderItem.setTailoringFabricId(itemli.getSyPackingListFabricId());//成衣或者面料主表ID
@@ -187,9 +190,10 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setVolume(syShippingOrder.getTotalVolume());//体积
                         totalVolume = syShippingOrder.getTatolVolume();
                         syShippingOrderItem.setDistributionPoint(itemli.getDistributionPoint());
-                        //单价 = 总金额/净重
+                        //报关单价 = 总金额/净重
                         BigDecimal price = itemli.getTotalPrice().divide(itemli.getNetWeight(),4,BigDecimal.ROUND_DOWN);
-                        syShippingOrderItem.setUnitPrice(price);
+                        syShippingOrderItem.setDeclarationUnitPrice(price);
+                        syShippingOrderItem.setUnitPrice(itemli.getPrice());
                         syShippingOrderItem.setPreShipmentDate(itemli.getPreDeliveryDate());
                         syShippingOrderItem.setSalesman(itemli.getSalesman());
                         syShippingOrderItem.setOperatingDepartment(itemli.getSalesDepartment());
@@ -240,7 +244,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         String createTime = sf.format(new Date());
                         syShippingOrderItem.setCreateTime(sf.parse(createTime));
 
-                        syShippingOrderItem.setGroupId(lit.getGroupId());//分组ID
+                        syShippingOrderItem.setGroupId(groupid);//分组ID
                         syShippingOrderItem.setNumber(lit.getPiecesBox());//数量
                         syShippingOrderItem.setBoxNumber(lit.getBoxNumber());//箱数
                         syShippingOrderItem.setId(oConvertUtils.id());
@@ -272,6 +276,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setRSupplierCode(null);//染厂供应商编码
                         syShippingOrderItem.setGarmentFactory(li.getGarmentFactory());//成衣工厂
                         syShippingOrderItem.setEnglishName(li.getEnglishProductName());//英文名称
+                        syShippingOrderItem.setDeclarationUnitPrice(lit.getCustomsDeclarationUnitPrice());//报关单价
 
                         itemList.add(syShippingOrderItem);