zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

来料加工订单

Browse Source
This commit is contained in:
潘荣晟
2026-01-25 16:57:10 +08:00
parent dad22ec7ec
commit ea02e5af4e
8 changed files with 142 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpOrderSaveReqVO.java
View File

@@ -35,6 +35,9 @@ public class ErpOrderSaveReqVO {
@NotEmpty(message = "采购订单行项目列表不能为空")
private List<Item> items;
@Valid
private List<Itex> itex; // 行项目扩展信息
private JSONArray accts; // 科目分配信息(科目分配类别为K或P时使用)
@Valid
private List<Comp> comps; // 委托加工物料信息(委托加工订单时使用)
@@ -165,8 +168,6 @@ public class ErpOrderSaveReqVO {
@Schema(description = "交货起止日期(格式:YYYYMMDD-YYYYMMDD)")
private String vend_mat; // IDNLF CHAR22
@Valid
private Itex itex; // 行项目扩展信息
}

23
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpOrderServiceImpl.java
View File

@@ -1,6 +1,8 @@
package com.zt.plat.module.erp.service.erp;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
import com.zt.plat.module.erp.api.ErpExternalApi;
import com.zt.plat.module.erp.api.dto.ErpSubmitReqDTO;
@@ -33,23 +35,26 @@ public class ErpOrderServiceImpl implements ErpOrderService {
req.put("exte", createVo.getExte());
req.put("acct", createVo.getAccts());
reqDTO.setReq(req);
return submitToErp(reqDTO);
}
private ErpSubmitReqDTO buildBaseReqDTO(ErpOrderSaveReqVO vo, String funcnr) {
ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO();
// reqDTO.setFuncnr(funcnr);
// reqDTO.setBskey(vo.getOrderNo());
// reqDTO.setUsrid(String.valueOf(SecurityFrameworkUtils.getLoginUserId()));
// reqDTO.setUsrnm((SecurityFrameworkUtils.getLoginUserNickname()));
reqDTO.setFuncnr(funcnr);
reqDTO.setBskey(vo.getOrderNo());
reqDTO.setUsrid(String.valueOf(SecurityFrameworkUtils.getLoginUserId()));
reqDTO.setUsrnm((SecurityFrameworkUtils.getLoginUserNickname()));
reqDTO.setUsrid("100048799");
reqDTO.setUsrnm("夏丽丽");
return reqDTO;
}
private String submitToErp(ErpSubmitReqDTO reqDTO) {
Map<String, String> response = erpExternalApi.submitDataToErp(reqDTO);
return response.get("resStr");
return JSONObject.toJSONString(response);
}
@@ -86,10 +91,11 @@ public class ErpOrderServiceImpl implements ErpOrderService {
Map<String, Object> req = new HashMap<>();
req.put("head", createVo.getHead());
req.put("item", createVo.getItems());
req.put("conds", createVo.getConds());
req.put("conds", JSONArray.parseArray(createVo.getConds().toString()));
req.put("partn_es", createVo.getPartn_es());
req.put("partn_numb", createVo.getPartn_numb());
reqDTO.setReq(req);
String reqJson = com.alibaba.fastjson2.JSON.toJSONString(reqDTO);
return submitToErp(reqDTO);
}
@@ -107,8 +113,11 @@ public class ErpOrderServiceImpl implements ErpOrderService {
ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO();
reqDTO.setFuncnr(funcnr);
reqDTO.setBskey(vo.getOrderNo());
reqDTO.setUsrid(String.valueOf(SecurityFrameworkUtils.getLoginUserId()));
reqDTO.setUsrnm((SecurityFrameworkUtils.getLoginUserNickname()));
reqDTO.setUsrid("100048799");
reqDTO.setUsrnm("夏丽丽");
// reqDTO.setBskey(vo.getOrderNo());
// reqDTO.setUsrid(String.valueOf(SecurityFrameworkUtils.getLoginUserId()));
// reqDTO.setUsrnm((SecurityFrameworkUtils.getLoginUserNickname()));
return reqDTO;
}
}

2
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/utils/ErpConfig.java
View File

@@ -82,7 +82,7 @@ public class ErpConfig {
if (succeed && "S".equals(dataObject.getString("E_FLAG"))) {
String flag = "S";
JSONArray E_RESP = dataObject.containsKey("E_DATA") ? dataObject.getJSONArray("E_DATA") : null;
String E_MSG = dataObject.containsKey("E_MSG") ? dataObject.getString("E_MSG") : null;
String E_MSG = dataObject.containsKey("E_MSG") ? dataObject.getString("E_MSG") : "";
resMap.put("E_RESP", E_RESP);
resMap.put("resStr", E_MSG);
resMap.put("flag", flag);