feat: 拼箱关联

src/main/java/com/glxp/api/entity/collect/RelCodeBatch.java

@@ -65,14 +65,14 @@ public class RelCodeBatch implements Serializable {
      */
     @TableField(value = "madeDate")
     @ApiModelProperty(value="生产日期")
-    private Date madeDate;
+    private String madeDate;
 
     /**
      * 有效期至
      */
     @TableField(value = "validateDate")
     @ApiModelProperty(value="有效期至")
-    private Date validateDate;
+    private String validateDate;
 
     /**
      * 生产车间

src/main/java/com/glxp/api/req/collect/RelCodeBatchRequest.java

@@ -46,12 +46,12 @@ public class RelCodeBatchRequest extends ListPageRequest {
     /**
      * 生产日期
      */
-    private Date madeDate;
+    private String madeDate;
 
     /**
      * 有效期至
      */
-    private Date validateDate;
+    private String validateDate;
 
     /**
      * 生产车间

src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java

@@ -97,9 +97,11 @@ public class RelCodeBatchService extends ServiceImpl<RelCodeBatchMapper, RelCode
                     String batchNo = batchE.getAttribute("batchNo");
                     relCodeBatch.setBatchNo(batchNo);
                     String madeDate = batchE.getAttribute("madeDate");
-                    relCodeBatch.setMadeDate(DateUtil.parse(madeDate,"yyyy-MM-dd"));
+                    relCodeBatch.setMadeDate(madeDate);
+//                    relCodeBatch.setMadeDate(DateUtil.parse(madeDate,"yyyy-MM-dd"));
                     String validateDate = batchE.getAttribute("validateDate");
-                    relCodeBatch.setValidateDate(DateUtil.offsetDay(DateUtil.parse(validateDate,"yyyy-MM-dd"),1));
+//                    relCodeBatch.setValidateDate(DateUtil.offsetDay(DateUtil.parse(validateDate,"yyyy-MM-dd"),1));
+                    relCodeBatch.setValidateDate(String.valueOf(DateUtil.offsetDay(DateUtil.parse(validateDate,"yyyy-MM-dd"),1)));
                     String workShop = batchE.getAttribute("workShop");
                     relCodeBatch.setWorkShop(workShop);
                     String lineName = batchE.getAttribute("lineName");