获取申报要素品名

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/controller/SupplierCapacityController.java

@@ -92,10 +92,10 @@ public class SupplierCapacityController extends JeecgController<SupplierCapacity
          queryWrapper.le("month(p.dArriveDate)",supplierCapacityDto.getEndDate().getMonth()+1);
          queryWrapper.le("year(p.dArriveDate)",new SimpleDateFormat("yyyy").format(supplierCapacityDto.getEndDate()));
       }*/
-      if(oConvertUtils.isNotEmpty(supplierCapacityDto.getStartDate().toString())){//起始日期
+      if(oConvertUtils.isNotEmpty(supplierCapacityDto.getStartDate())){//起始日期
          queryWrapper.ge("p.dArriveDate",supplierCapacityDto.getStartDate());
       }
-      if(oConvertUtils.isNotEmpty(supplierCapacityDto.getEndDate().toString())){//结束日期
+      if(oConvertUtils.isNotEmpty(supplierCapacityDto.getEndDate())){//结束日期
          queryWrapper.le("p.dArriveDate",supplierCapacityDto.getEndDate());
       }
       if(oConvertUtils.isNotEmpty(supplierCapacityDto.getOrderType())){//订单类型

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/dto/SupplierCapacityDto.java

@@ -24,15 +24,11 @@ public class SupplierCapacityDto {
     @ApiModelProperty(value = "订单类型(委外订单、采购订单)")
     private String orderType;//订单类型
 
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "开始日期")
-    private Date startDate;//开始日期*/
+    private String startDate;//开始日期*/
 
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "结束日期")
-    private Date endDate;//结束日期
+    private String endDate;//结束日期
 
     /*@ApiModelProperty(value = "开始月份")
     private Integer startDate;//开始月份

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/xml/SyPreAssembledPackingListMapper.xml

@@ -4,8 +4,8 @@
     <select id="selectSyShippingDetailsData" parameterType="java.lang.String" resultType="org.jeecg.modules.spapl.entity.SyPreAssembledPackingList">
     /*获取发运明细数据*/
     SELECT t.*,
-	 (SELECT english_product_name FROM  sy_declaration_elements WHERE id=t.elements_id) productName,
-	 (SELECT declaration_name FROM  sy_declaration_elements WHERE id=t.elements_id) english_product_name
+	 (SELECT product_Name FROM  sy_declaration_elements WHERE id=t.elements_id) productName,
+	 (SELECT english_product_name FROM  sy_declaration_elements WHERE id=t.elements_id) english_product_name
     FROM (
     SELECT
         sy_shipping_details.id AS syDeclarationElementsId, /*发运明细主表id*/
@@ -74,6 +74,7 @@
         a.spur_or_sub_order,/*采购委外订单号*/
         b.inventory_name,/*存货名称*/
         b.small_po,/*小po*/
+        b.colour,/*颜色*/
         b.distribution_point/*分销点*/
     FROM Sy_Pre_Assembled_Packing_List  a
     LEFT JOIN Sy_Pre_Assembled_Packing_List_item  b

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListServiceImpl.java

@@ -400,8 +400,10 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 			syItem=syShippingDetailsItemMapper.selectById(item.getSyDeclarationElementsItemId());
 			if(syItem!=null){
 				main=syPreAssembledPackingListMapper.selectById(item.getSyPreAssembledPackingListId());
-				main.setCustomerAbbreviation(syItem.getCustomerAbbreviation());
+				main.setCustomerAbbreviation(syItem.getCustomerAbbreviation());//客户简称
 				main.setOrderNumber(syItem.getOrderNumber());//修改订单号
+				main.setSpurOrSubOrder(syItem.getPurOrSubOrder());//修改委外订单号
+				main.setOmpoId(syItem.getOmpoId());//修改委外订单id
 				syPreAssembledPackingListMapper.updateById(main);
 			}
 		}