物料推送 推送人

mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java

@@ -1153,12 +1153,13 @@ public class MaterialBaseInfoApplicationService {
         return orgCandidates;
     }
 
-    public int updatePushStatus(Long materialBaseInfoId, Integer pushStatus, Date pushTimeDate, Long pushBy) {
+    public int updatePushStatus(Long materialBaseInfoId, Integer pushStatus, Date pushTimeDate, Long pushBy, String pushByName) {
         MaterialBaseInfo materialBaseInfo = new MaterialBaseInfo();
         materialBaseInfo.setMaterialBaseInfoId(materialBaseInfoId);
         materialBaseInfo.setPushStatus(pushStatus);
         materialBaseInfo.setPushTime(pushTimeDate);
         materialBaseInfo.setPushBy(pushBy);
+        materialBaseInfo.setPushByName(pushByName);
         return materialBaseInfoMapper.updateById(materialBaseInfo);
     }
 

mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java

@@ -220,6 +220,9 @@ public class MaterialBaseInfo extends BaseVOEntity {
     @ApiModelProperty(name = "推送人")
     private Long pushBy;
 
+    @ApiModelProperty(name = "推送人名称")
+    private String pushByName;
+
     @ApiModelProperty("毛重（kg）")
     @Excel(name = "毛重（kg）")
     private BigDecimal grossWeight;

mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java

@@ -272,4 +272,7 @@ public class MaterialBaseInfoPO extends BaseVOEntity {
     @ApiModelProperty("推送人")
     private Long pushBy;
 
+    @ApiModelProperty(name = "推送人名称")
+    private String pushByName;
+
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java

@@ -293,4 +293,7 @@ public class MaterialBaseInfoDTO extends BaseVOEntity {
 
     @ApiModelProperty("更新时间止")
     private String updateTimeEnd;
+
+    @ApiModelProperty(name = "推送人名称")
+    private String pushByName;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialBaseInfo/MaterialBaseInfoApi.java

@@ -118,12 +118,13 @@ public class MaterialBaseInfoApi extends BaseController {
     public AjaxResult<?> updateMaterialPushStatus(@RequestParam("materialBaseInfoId") Long materialBaseInfoId,
                                          @RequestParam("pushStatus") Integer pushStatus,
                                          @RequestParam(value = "pushTime",required = false) String pushTime,
-                                         @RequestParam(value = "pushBy",required = false) Long pushBy){
+                                         @RequestParam(value = "pushBy",required = false) Long pushBy,
+                                                  @RequestParam(value = "pushByName",required = false) String pushByName){
         Date pushTimeDate = null;
         if (StringUtils.isNotBlank(pushTime)) {
             pushTimeDate = DateUtil.parse(pushTime);
         }
-        return toAjax(materialBaseInfoApplicationService.updatePushStatus(materialBaseInfoId, pushStatus, pushTimeDate, pushBy));
+        return toAjax(materialBaseInfoApplicationService.updatePushStatus(materialBaseInfoId, pushStatus, pushTimeDate, pushBy, pushByName));
     }
 
     @ApiOperation("查询物料基础信息列表")