物料推送 推送人

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("查询物料基础信息列表")