Merge remote-tracking branch 'origin/master'

sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java

@@ -212,6 +212,9 @@ public class BackApplyInfo extends BaseEntity {
      */
     private Integer bfNum;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date backReceiveTime;
+
 
 
     @Excel(name = "退料状态" , readConverterExp = "37=待退料审核,38=退料已审核,39=退料核查中,40=退料完成,101 = 退料审核驳回")

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java

@@ -211,4 +211,6 @@ public interface BackReceiveMapper {
     List<BackApplyInfo> backReceiveRecordWebPt(BackApplyInfo record);
 
     int finishBackCheckDetails(BackApplyInfo record);
+
+    void updateBackReceiveTime(BackApplyInfo record);
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java

@@ -267,6 +267,8 @@ public class BackReceiveServiceImpl implements BackReceiveService {
 
                 //完成退料的部分，更新 back_check_details 为 is_finished=1，此部分不支持撤回
                 finishBackCheckDetails(record);
+                //更新退料接收时间
+                updateBackReceiveTime(record);
 
                 //库存日志
                 int postStoreNum = backReceiveMapper.getmaChineByCt(record);
@@ -281,6 +283,10 @@ public class BackReceiveServiceImpl implements BackReceiveService {
         return res;
     }
 
+    private void updateBackReceiveTime(BackApplyInfo record) {
+        backReceiveMapper.updateBackReceiveTime(record);
+    }
+
     private int selectTaskStatus(int taskId) {
         int taskStatus = backReceiveMapper.selectTaskStatus(taskId);
         if (taskStatus == 40) {

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java

@@ -116,6 +116,17 @@ public class PurchaseMacodeInfo extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "出厂日期")
     private Date productionTime;
+    @ApiModelProperty(value = "入库时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date inputTime;
+
+    public Date getInputTime() {
+        return inputTime;
+    }
+
+    public void setInputTime(Date inputTime) {
+        this.inputTime = inputTime;
+    }
 
     /** 到货日期 */
     @ApiModelProperty(value = "到货日期")

sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml

@@ -586,6 +586,9 @@
   <update id="finishBackCheckDetails">
     update back_check_details set is_finished = 1, update_time = now() where parent_id = #{parentId} and type_id = #{typeId} and (is_finished is null or is_finished != 1)
   </update>
+  <update id="updateBackReceiveTime">
+    update back_apply_details set back_receive_time = now() where parent_id = #{parentId} and type_id = #{typeId}
+  </update>
 
   <delete id="deleteCheckDetails">
     delete from back_check_details where parent_id = #{parentId} and type_id = #{typeId} and (is_finished is null or is_finished != 1)
@@ -677,6 +680,7 @@
       bad.pre_num as preNum,
       bad.audit_num as auditNum,
       bad.status as status,
+      bad.back_receive_time as backReceiveTime,
       CASE WHEN ((IFNULL(sai.num, 0)-IFNULL(aa.back_num,0)) > (bad.audit_num-IFNULL(bb.finished_back_num,0)-IFNULL(aa.back_num,0)))
           THEN (bad.audit_num-IFNULL(bb.finished_back_num,0)-IFNULL(aa.back_num,0))
           ELSE

sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml

@@ -181,7 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         END as inputTime,
         CASE tk.task_status
         WHEN 28 THEN
-        us.user_name
+        us.nick_name
         ELSE
         ''
         END as inputUser

sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml

@@ -361,6 +361,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                mm.assets_code as assetsCode,
                pmi.fix_code as fixCode,
                pcd.type_id as typeId,
+               pcd.input_time as inputTime,
                pcd.task_id as taskId,
                mt.code as specsCode,
                mt.num as num,