oms-gw推送-物料管理 修改企业国别字段类型

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

@@ -20,6 +20,7 @@ import com.mhd.wms.domain.materialBarCode.service.MaterialBarCodeDomainService;
 import com.mhd.wms.domain.materialBarCode.repository.todo.MaterialBarCodeDO;
 import com.mhd.wms.domain.materialBaseInfo.entity.MaterialBaseInfo;
 import com.mhd.wms.domain.materialBaseInfo.repository.facade.IMaterialBaseInfoService;
+import com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper;
 import com.mhd.wms.domain.materialBaseInfo.repository.po.MaterialBaseInfoPO;
 import com.mhd.wms.domain.materialBaseInfo.repository.todo.MaterialBaseInfoDO;
 import com.mhd.wms.domain.materialBaseInfo.service.MaterialBaseInfoDomainService;
@@ -49,6 +50,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Date;
@@ -97,6 +99,8 @@ public class MaterialBaseInfoApplicationService {
     @Autowired
     private IMaterialWarehouseControlService materialWarehouseControlService;
 
+    @Resource
+    private MaterialBaseInfoMapper materialBaseInfoMapper;
     /**
      * 分页查询物料基础信息列表
      */
@@ -1148,4 +1152,12 @@ public class MaterialBaseInfoApplicationService {
         return orgCandidates;
     }
 
+    public int updatePushStatus(Long materialBaseInfoId, Integer pushStatus, Date pushTimeDate, Long pushBy) {
+        MaterialBaseInfo materialBaseInfo = new MaterialBaseInfo();
+        materialBaseInfo.setMaterialBaseInfoId(materialBaseInfoId);
+        materialBaseInfo.setPushStatus(pushStatus);
+        materialBaseInfo.setPushTime(pushTimeDate);
+        materialBaseInfo.setPushBy(pushBy);
+        return materialBaseInfoMapper.updateById(materialBaseInfo);
+    }
 }

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

@@ -1,7 +1,9 @@
 package com.mhd.wms.interfaces.facadeApi.materialBaseInfo;
 
+import cn.hutool.core.date.DateUtil;
 import com.mhd.common.core.domain.entity.R;
 import com.mhd.common.core.exception.ServiceException;
+import com.mhd.common.core.utils.StringUtils;
 import com.mhd.common.core.web.controller.BaseController;
 import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.core.web.page.TableDataInfo;
@@ -17,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -109,7 +112,18 @@ public class MaterialBaseInfoApi extends BaseController {
         return materialBaseInfoApplicationService.importData(file);
     }
 
-
+    @ApiOperation("物料管理更新推送信息")
+    @PostMapping("/updatePushStatus")
+    public AjaxResult<?> updateMaterialPushStatus(@RequestParam("materialBaseInfoId") Long materialBaseInfoId,
+                                         @RequestParam("pushStatus") Integer pushStatus,
+                                         @RequestParam("pushTime") String pushTime,
+                                         @RequestParam("pushBy") Long pushBy){
+        Date pushTimeDate = null;
+        if (StringUtils.isNotBlank(pushTime)) {
+            pushTimeDate = DateUtil.parse(pushTime);
+        }
+        return toAjax(materialBaseInfoApplicationService.updatePushStatus(materialBaseInfoId, pushStatus, pushTimeDate, pushBy));
+    }