修改订单入库时间问题

src/main/java/com/jsh/erp/datasource/entities/DepotHead.java

@@ -139,6 +139,12 @@ public class DepotHead {
     @ApiModelProperty("收货人地址")
     private String receiverAddress;
 
+    @ApiModelProperty("仓库id")
+    private Long depotId;
+
+    @ApiModelProperty("操作人")
+    private Long operId;
+
 
     public Long getId() {
         return id;

src/main/java/com/jsh/erp/datasource/entities/DepotItem.java

@@ -1,6 +1,7 @@
 package com.jsh.erp.datasource.entities;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -102,7 +103,7 @@ public class DepotItem {
     private Long warehousingUser;
 
     @ApiModelProperty("出入库时间")
-    private Date warehousingTime;
+    private String warehousingTime;
 
     public Long getId() {
         return id;

src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java

@@ -1,7 +1,9 @@
 package com.jsh.erp.datasource.entities;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 
@@ -59,6 +61,7 @@ public class DepotItemVo4WithInfoEx extends DepotItem{
     private String brand;
 
     @ApiModelProperty("生产日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private String productionDate;
 
     @ApiModelProperty("保质期天数")

src/main/java/com/jsh/erp/service/impl/DepotHeadServiceImpl.java

@@ -1282,6 +1282,10 @@ public class DepotHeadServiceImpl extends ServiceImpl<DepotHeadMapper, DepotHead
         depotHead.setGoodsQuantity(operNumber);
         //商品总类
         depotHead.setGoodsTypeCount(rowArr.size());
+        //修改时间
+        depotHead.setOperTime(new Date());
+        //修改操作人
+        depotHead.setOperId(userService.getCurrentUser().getId());
         //修改单据主表
         depotHeadMapper.updateByPrimaryKeySelective(depotHead);
         //如果存在多账户结算需要将原账户的id置空
@@ -1887,6 +1891,8 @@ public class DepotHeadServiceImpl extends ServiceImpl<DepotHeadMapper, DepotHead
         List<DepotItem> depotItems = depotItemService.getListByHeaderId(depotHead.getId());
         //设置单据主表信息
         depotHead.setId(null);
+        //设置关联订单
+        depotHead.setLinkNumber(depotHead.getNumber());
         String number = sequenceService.buildOnlyNumber();
         //设置单号
         if ("采购订单".equals(depotHead.getSubType())){
@@ -1919,9 +1925,11 @@ public class DepotHeadServiceImpl extends ServiceImpl<DepotHeadMapper, DepotHead
             }
         }
         //判断用户是否已经登录过，登录过不再处理
-        User userInfo=userService.getCurrentUser();
+        User userInfo = userService.getCurrentUser();
         depotHead.setCreator(userInfo==null?null:userInfo.getId());
         depotHead.setCreateTime(new Timestamp(System.currentTimeMillis()));
+        depotHead.setOperId(userInfo==null?null:userInfo.getId());
+        depotHead.setOperTime(new Timestamp(System.currentTimeMillis()));
         if(StringUtil.isEmpty(depotHead.getStatus())) {
             depotHead.setStatus(BusinessConstants.BILLS_STATUS_UN_AUDIT);
         }
@@ -1966,6 +1974,7 @@ public class DepotHeadServiceImpl extends ServiceImpl<DepotHeadMapper, DepotHead
         User user = userService.getCurrentUser();
         depotHead.setTenantId(user.getId());
         depotHead.setCreateTime(new Timestamp(System.currentTimeMillis()));
+        depotHead.setStatus("2");
         //添加主表
         depotHeadMapper.insertSelective(depotHead);
         //根据单据编号查询单据id

src/main/java/com/jsh/erp/service/impl/DepotItemServiceImpl.java

@@ -499,7 +499,7 @@ public class DepotItemServiceImpl extends ServiceImpl<DepotItemMapper, DepotItem
                 depotItem.setWarehousingVariance(rowObj.getBigDecimal("warehousingVariance"));
                 depotItem.setReasonOfDifference(rowObj.getString("reasonOfDifference"));
                 depotItem.setWarehousingUser(rowObj.getLong("warehousingUser"));
-                depotItem.setWarehousingTime(rowObj.getDate("warehousingTime"));
+                depotItem.setWarehousingTime(rowObj.getString("warehousingTime"));
                 Material material= materialService.getMaterial(depotItem.getMaterialId());
                 if (BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber()) ||
                         BusinessConstants.ENABLE_BATCH_NUMBER_ENABLED.equals(material.getEnableBatchNumber())) {