10539622/2025-03-JS-SDK-svr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

update 辅料出库模块，迁移确认备货、取消确认备货、出库方法

Browse Source
This commit is contained in:
18110972313 2025-04-24 15:59:13 +08:00
parent fa051e2770
commit 1dc84aeb76
1 changed files with 89 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
zi-wms-pda/src/main/java/com/cim/idm/controller/SaleOutController.java
View File

@ -1,15 +1,19 @@
package com.cim.idm.controller; package com.cim.idm.controller;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.cim.idm.framework.IDMFrameServiceProxy; import com.cim.idm.framework.IDMFrameServiceProxy;
import com.cim.idm.framework.data.EventInfo;
import com.cim.idm.model.MaterialPacking; import com.cim.idm.model.MaterialPacking;
import com.cim.idm.model.MaterialshipRequest; import com.cim.idm.model.MaterialshipRequest;
import com.cim.idm.model.SalePreOrderDto; import com.cim.idm.model.SalePreOrderDto;
import com.cim.idm.model.StockOutDto; import com.cim.idm.model.StockOutDto;
import com.cim.idm.service.IMaterialShipService;
import com.cim.idm.service.Impl.InvoiceServiceImpl; import com.cim.idm.service.Impl.InvoiceServiceImpl;
import com.cim.idm.service.Impl.SaleOutServiceImpl; import com.cim.idm.service.Impl.SaleOutServiceImpl;
import com.cim.idm.utils.AjaxResult; import com.cim.idm.utils.AjaxResult;
import com.cim.idm.utils.EventInfoUtil;
import com.cim.idm.wmsextend.generic.errorHandler.CustomException; import com.cim.idm.wmsextend.generic.errorHandler.CustomException;
import com.cim.idm.wmspackage.materialpacking.MaterialPackingServiceProxy; import com.cim.idm.wmspackage.materialpacking.MaterialPackingServiceProxy;
import com.cim.idm.wmspackage.materialpacking.management.data.MaterialPackingKey; import com.cim.idm.wmspackage.materialpacking.management.data.MaterialPackingKey;
@ -36,6 +40,9 @@ public class SaleOutController {
@Autowired @Autowired
private SaleOutServiceImpl SaleOut; private SaleOutServiceImpl SaleOut;
@Autowired
private IMaterialShipService materialShipService;
@RequestMapping(value = "/getBhCondition", method = RequestMethod.POST) @RequestMapping(value = "/getBhCondition", method = RequestMethod.POST)
public AjaxResult getBhCondition(@RequestBody JSONObject in ){ public AjaxResult getBhCondition(@RequestBody JSONObject in ){
@ -972,4 +979,86 @@ public class SaleOutController {
IDMFrameServiceProxy.getSqlTemplate().update(dhSql, bindMap); IDMFrameServiceProxy.getSqlTemplate().update(dhSql, bindMap);
return AjaxResult.me().setSuccess(true).setMessage("更新备货成功"); return AjaxResult.me().setSuccess(true).setMessage("更新备货成功");
} }
/**
* 确认备货
* @param in
* @return
* @throws Exception
*/
@RequestMapping(value = "/auxiliaryAssign", method = RequestMethod.POST)
public AjaxResult AuxiliaryAssign(@RequestBody JSONObject in ) throws Exception{
String siteName = (String)in.get("SITENAME");
String user = (String)in.get("USER");
String shipRequestName = (String)in.get("SHIPREQUESTNAME");
JSONArray boxListArray = in.getJSONArray("BOXLIST");
List<LinkedHashMap<String,String>> boxList = new ArrayList<LinkedHashMap<String,String>>();
if(null == boxListArray || boxListArray.size() <= 0) {
return AjaxResult.me().setSuccess(true).setMessage("未获取到：" + shipRequestName + "的发货单据信息").setErrorCode(400);
}
// 遍历 JSONArray 并转换为 LinkedHashMap
for (int i = 0; i < boxListArray.size(); i++) {
JSONObject jsonObject = boxListArray.getJSONObject(i);
LinkedHashMap<String, String> linkedHashMap = new LinkedHashMap<>();
// 将每个字段添加到 LinkedHashMap 中
for (String key : jsonObject.keySet()) {
linkedHashMap.put(key, jsonObject.getString(key));
}
// 添加到列表中
boxList.add(linkedHashMap);
}
EventInfo eventInfo = new EventInfoUtil().makeEventInfo("auxiliaryAssign", user, "auxiliaryAssign", "", "");
return materialShipService.MaterialShipRequestAuxiliaryConfirmStocking(eventInfo,siteName,shipRequestName,user,boxList);
}
/**
* 辅材出库
* @param in
* @return
* @throws Exception
*/
@RequestMapping(value = "/auxiliaryStockOut", method = RequestMethod.POST)
public AjaxResult AuxiliaryStockOut(@RequestBody JSONObject in ) throws Exception{
String siteName = (String)in.get("SITENAME");
String user = (String)in.get("USER");
String shipRequestName = (String)in.get("SHIPREQUESTNAME");
String commitDate = (String)in.get("commitDate");
JSONArray boxListArray = in.getJSONArray("BOXLIST");
List<LinkedHashMap<String,String>> boxList = new ArrayList<LinkedHashMap<String,String>>();
if(null == boxListArray || boxListArray.size() <= 0) {
return AjaxResult.me().setSuccess(true).setMessage("未获取到：" + shipRequestName + "的发货单据信息").setErrorCode(400);
}
// 遍历 JSONArray 并转换为 LinkedHashMap
for (int i = 0; i < boxListArray.size(); i++) {
JSONObject jsonObject = boxListArray.getJSONObject(i);
LinkedHashMap<String, String> linkedHashMap = new LinkedHashMap<>();
// 将每个字段添加到 LinkedHashMap 中
for (String key : jsonObject.keySet()) {
linkedHashMap.put(key, jsonObject.getString(key));
}
// 添加到列表中
boxList.add(linkedHashMap);
}
EventInfo eventInfo = new EventInfoUtil().makeEventInfo("auxiliaryStockOut", user, "auxiliaryStockOut", "", "");
return materialShipService.MaterialShipRequestAuxiliaryStockOut(eventInfo,siteName,shipRequestName,user,boxList,commitDate);
}
/**
* 取消确认备货
* @param in
* @return
* @throws Exception
*/
@RequestMapping(value = "/auxiliaryDessign", method = RequestMethod.POST)
public AjaxResult AuxiliaryDessign(@RequestBody JSONObject in ) throws Exception{
String siteName = (String)in.get("SITENAME");
String user = (String)in.get("USER");
String shipRequestName = (String)in.get("SHIPREQUESTNAME");
if(StringUtils.isEmpty(shipRequestName)) {
return AjaxResult.me().setSuccess(true).setMessage("单号不能为空").setErrorCode(400);
}
EventInfo eventInfo = new EventInfoUtil().makeEventInfo("auxiliaryDessign", user, "auxiliaryDessign", "", "");
return materialShipService.MaterialShipRequestAuxiliaryCancelConfirmStocking(eventInfo,siteName,shipRequestName,user);
}
} }