预托书回写

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/service/impl/SyLetterDepositServiceImpl.java

@@ -329,10 +329,10 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
             //修改预装箱单主表参照状态
             SyPreAssembledPackingList entit = new SyPreAssembledPackingList();
             entit.setId(li.getSyPreAssembledPackingListId());
-            entit.setDepositaryReceiptNo(null);
+            entit.setDepositaryReceiptNo("");
             entit.setIsReference(0);
-            entit.setContainerNumber(null);
-            entit.setContainerCode(null);
+            entit.setContainerNumber("");
+            entit.setContainerCode("");
             syPreAssembledPackingListService.updateById(entit);
 
             //查询预装箱单子表

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

@@ -489,6 +489,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	  try {
 		  Page<SyShippingDetailsVo> page = new Page<SyShippingDetailsVo>(1, -1);
 		  if(syShippingDetails.getFlourOrGarment().equals("0")){//面辅料
+
 			  List<SyShippingDetailsVo> itemList = syShippingDetailsMapper.excelItem(queryWrapper);
 
 			  org.jeecgframework.poi.excel.entity.TemplateExportParams params = new org.jeecgframework.poi.excel.entity.TemplateExportParams("D:\\单证模板\\出运面辅料数据.xlsx");

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/entity/VO/SyPreAssembledPackingListVo.java

@@ -200,7 +200,7 @@ public class SyPreAssembledPackingListVo {
         String fwSplit = fw[0]+"~"+fw[fw.length-1];
 
         return account+"*"+garmentFactory+"*"+preDeliveryDate+"*"+itemNumber+"*"+smallPo+"*"+distributionPoint+
-                "*"+""+"*"+""+"*"+""+"*"+""+"*"+builder+color+"*"+codingRules+"*"+""+"*"+plannedShippingQuantity+
+                "*"+""+"*"+""+"*"+""+"*"+""+"*"+builder+"*"+color+"*"+codingRules+"*"+""+"*"+plannedShippingQuantity+
                 "*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+unitPrice+
                 "*"+""+"*"+""+"*"+itemId+"*"+groupId+"*"+id+"*"+orderNumber+"*"+itemNuber+"*"+fwSplit+"*"+customer+"*"+customerAbb+"*"+elenmentId;
     }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/entity/VO/SyShippingDetailsVo.java

@@ -178,12 +178,12 @@ public class SyShippingDetailsVo {
     private java.math.BigDecimal exchangeRate;
 
     /**整单合计*/
-    @Excel(name = "整单合计", width = 15)
+    //@Excel(name = "整单合计", width = 15)
     @ApiModelProperty(value = "整单合计")
     private java.math.BigDecimal wholeOrderTotal;
 
     /**币种文本*/
-    @Excel(name = "币种文本", width = 15)
+    //@Excel(name = "币种文本", width = 15)
     @ApiModelProperty(value = "币种文本")
     private java.lang.String currencyText;
 

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

@@ -238,7 +238,7 @@ ${ew.customSqlSegment}
         b.material_composition as materialComposition,b.guangpei_gate_width as guangpeiGateWidth,b.weight,b.is_reference as isReference,
         b.excess_quantity as excessQuantity,d.master_metering as masterMetering,b.garment_factory as garmentFactory,
         b.id as itemIds,a.id as id,b.elements_id as elementsId,b.r_supplier_code as rSupplierCode,b.r_supplier as rSupplier,
-        b.supplier,b.supplier_code as supplierCode,b.specification_and_model as specificationAndModel
+        b.supplier,b.supplier_code as supplierCode,b.specification_and_model as specificationAndModel,b.inventory_ccode as inventoryCcode
          from sy_shipping_details a
 left join sy_shipping_details_item b
 on a.id = b.shipping_details_id
@@ -246,7 +246,7 @@ left join sy_declaration_elements c
 on b.elements_id = c.id
 left join sy_order_data_item d
 on b.sy_order_data_item_id = d.id
-where a.del_flag = 0 and b.del_flag = 0) t
+where a.del_flag = 0 and b.del_flag = 0 and b.inventory_ccode NOT LIKE '19%') t
 ${ew.customSqlSegment}
     </select>
 

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

@@ -372,7 +372,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 		  }
 		  //预发货日期
 		  if(oConvertUtils.isNotEmpty(syPackingList.getPreDeliveryDate())){
-			  queryWrapper.eq("b.hot",syPackingList.getPreDeliveryDate());
+			  queryWrapper.between("b.hod",syPackingList.getPreDeliveryDate(),syPackingList.getPreDeliveryDate());
 		  }
 		  //供应商
 		  if(oConvertUtils.isNotEmpty(supplier)){

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

@@ -364,10 +364,10 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                 }
                 //回写预装箱-面料是否被参照，托书号
                 syPackingListFabric.setIsReference(0);
-                syPackingListFabric.setShippingOrderNumber(null);
-                syPackingListFabric.setExportInvoiceNo(null);
-                syPackingListFabric.setContainerCode(null);
-                syPackingListFabric.setContainerNumber(null);
+                syPackingListFabric.setShippingOrderNumber("");
+                syPackingListFabric.setExportInvoiceNo("");
+                syPackingListFabric.setContainerCode("");
+                syPackingListFabric.setContainerNumber("");
                 syPackingListFabricService.updateById(syPackingListFabric);
 
             }else{//成衣
@@ -377,10 +377,10 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     throw new JeecgBootException("没有查询到装箱单成衣数据！");
                 }
                 syPackingListTailoring.setIsReference(0);
-                syPackingListTailoring.setShippingOrderNumber(null);
-                syPackingListTailoring.setExportInvoiceNo(null);
-                syPackingListTailoring.setContainerCode(null);
-                syPackingListTailoring.setContainerNumber(null);
+                syPackingListTailoring.setShippingOrderNumber("");
+                syPackingListTailoring.setExportInvoiceNo("");
+                syPackingListTailoring.setContainerCode("");
+                syPackingListTailoring.setContainerNumber("");
                 syPackingListTailoringService.updateById(syPackingListTailoring);
             }
             //删除子表
@@ -448,10 +448,10 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                 }
                 //回写预装箱-面料是否被参照，托书号
                 syPackingListFabric.setIsReference(0);
-                syPackingListFabric.setShippingOrderNumber(null);
-                syPackingListFabric.setExportInvoiceNo(null);
-                syPackingListFabric.setContainerCode(null);
-                syPackingListFabric.setContainerNumber(null);
+                syPackingListFabric.setShippingOrderNumber("");
+                syPackingListFabric.setExportInvoiceNo("");
+                syPackingListFabric.setContainerCode("");
+                syPackingListFabric.setContainerNumber("");
                 syPackingListFabricService.updateById(syPackingListFabric);
 
             }else{//成衣
@@ -461,10 +461,10 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     throw new JeecgBootException("没有查询到装箱单成衣数据！");
                 }
                 syPackingListTailoring.setIsReference(0);
-                syPackingListTailoring.setShippingOrderNumber(null);
-                syPackingListTailoring.setExportInvoiceNo(null);
-                syPackingListTailoring.setContainerCode(null);
-                syPackingListTailoring.setContainerNumber(null);
+                syPackingListTailoring.setShippingOrderNumber("");
+                syPackingListTailoring.setExportInvoiceNo("");
+                syPackingListTailoring.setContainerCode("");
+                syPackingListTailoring.setContainerNumber("");
                 syPackingListTailoringService.updateById(syPackingListTailoring);
             }
         }