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

委托加工和回收率管理优化

Browse Source
This commit is contained in:
潘荣晟
2026-02-04 16:28:24 +08:00
parent 7ba5dc2fc3
commit 4a091f54c3
13 changed files with 499 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,7 +128,7 @@ public class ErpSalesOrderSaveReqVO {
private BigDecimal target_qty; // 销售数量 QUAN13,3
@Schema(description = "税分类(默认从客户和物料基础数据带出,创建物料销售视图时默认值为1-13%)")
private String tax_class1 = "1"; // 税分类 CHAR1
private String tax_class1; // 税分类 CHAR1
@Schema(description = "项目类别")
private String item_categ; // 项目类别 CHAR4

164
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/SalesDocumentRequestVO.java Normal file
View File

File diff suppressed because it is too large Load Diff

4
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpErpMaterialCorrServiceImpl.java
View File

@@ -39,8 +39,8 @@ public class ErpErpMaterialCorrServiceImpl implements ErpErpMaterialCorrService{
}
CommonResult<DeptRespDTO> dept = deptApi.getDept(reqVO.getDeptId());
DeptRespDTO data = dept.getData();
if (data==null) {
throw exception(new ErrorCode(1027004000, "部门不存在"));
if (data==null||data.getCode().isEmpty()) {
throw exception(new ErrorCode(1027004000, "部门或部门公司编码不存在，部门编号为:{}"), reqVO.getDeptId().toString());
}
erpMaterialCorrDOS.add(ErpMaterialCorrDO.builder()
.materialParentId(reqVO.getMaterialParentId())

10
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpOrderService.java
View File

@@ -1,9 +1,9 @@
package com.zt.plat.module.erp.service.erp;
import com.zt.plat.module.erp.controller.admin.erp.vo.ErpBillMainSaveReqVO;
import com.zt.plat.module.erp.controller.admin.erp.vo.ErpOrderSaveReqVO;
import com.zt.plat.module.erp.controller.admin.erp.vo.ErpOrderUpdateReqVO;
import com.zt.plat.module.erp.controller.admin.erp.vo.ErpSalesOrderSaveReqVO;
import com.zt.plat.module.erp.controller.admin.erp.vo.*;
import java.util.HashMap;
import java.util.Map;
public interface ErpOrderService {
@@ -12,4 +12,6 @@ public interface ErpOrderService {
String submitOrderToErp062(ErpOrderUpdateReqVO createVo);
String submitOrderToErp091(ErpSalesOrderSaveReqVO erpSalesOrderSaveReqVO);
String submitOrderToErp092(SalesDocumentRequestVO salesDocumentRequest);
}

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

@@ -7,10 +7,7 @@ import com.zt.plat.framework.common.pojo.CommonResult;
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;
import com.zt.plat.module.erp.controller.admin.erp.vo.ErpBillMainSaveReqVO;
import com.zt.plat.module.erp.controller.admin.erp.vo.ErpOrderSaveReqVO;
import com.zt.plat.module.erp.controller.admin.erp.vo.ErpOrderUpdateReqVO;
import com.zt.plat.module.erp.controller.admin.erp.vo.ErpSalesOrderSaveReqVO;
import com.zt.plat.module.erp.controller.admin.erp.vo.*;
import com.zt.plat.module.system.api.user.AdminUserApi;
import com.zt.plat.module.system.api.user.dto.AdminUserRespDTO;
import jakarta.annotation.Resource;
@@ -106,6 +103,30 @@ public class ErpOrderServiceImpl implements ErpOrderService {
return submitToErp(reqDTO);
}
@Override
public String submitOrderToErp092(SalesDocumentRequestVO salesDocumentRequest) {
ErpSubmitReqDTO reqDTO = buildBaseReqDTO092(salesDocumentRequest,"092");
Map<String, Object> req = new HashMap<>();
req.put("head", salesDocumentRequest.getHead());
req.put("item", salesDocumentRequest.getItemList());
req.put("cond", JSONArray.parseArray(salesDocumentRequest.getCondList().toString()));
req.put("salesdocument", salesDocumentRequest.getSalesdocument());
req.put("updateflag", salesDocumentRequest.getUpdateflag());
req.put("partn_es", salesDocumentRequest.getPartn_es());
reqDTO.setReq(req);
String reqJson = com.alibaba.fastjson2.JSON.toJSONString(reqDTO);
return submitToErp(reqDTO);
}
private ErpSubmitReqDTO buildBaseReqDTO092(SalesDocumentRequestVO salesDocumentRequest,String funcnr){
AdminUserRespDTO userRespDTO = getWorkId();
ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO();
reqDTO.setFuncnr(funcnr);
reqDTO.setBskey(salesDocumentRequest.getOrderNo());
reqDTO.setUsrid(userRespDTO.getWorkcode());
reqDTO.setUsrnm(userRespDTO.getUsername());
return reqDTO;
}
private ErpSubmitReqDTO buildBaseReqDTO062(ErpOrderUpdateReqVO vo, String funcnr) {
ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO();
// reqDTO.setFuncnr(funcnr);