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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
潘荣晟
2025-10-21 18:05:13 +08:00
parent a0a27c4d01 a4b997ec49
commit c5467b2c71
7 changed files with 75 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/contract/DictEnum.java
View File

@@ -1,8 +1,11 @@
package com.zt.plat.module.contractorder.enums.contract;
import lombok.Getter;
/**
* 字典枚举
*/
@Getter
public enum DictEnum {
/** ERP请求状态 */
@@ -60,19 +63,7 @@ public enum DictEnum {
*/
private final String remark;
public String getLabel() {
return label;
}
public String getCode() {
return code;
}
public String getRemark() {
return remark;
}
public static DictEnum getByCode(String code, String dictType) {
public static DictEnum getByCodeAndType(String code, String dictType) {
return DictEnum.valueOf(dictType + "_" +code);
}
}

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java
View File

@@ -145,7 +145,7 @@ public class ContractController implements BusinessControllerMarker {
@PostMapping("/submit/erp")
@Operation(summary = "提交ERP")
@PreAuthorize("@ss.hasPermission('base:contract:erp')")
public CommonResult<Boolean> submitErp(@RequestBody List<Long> ids) {
public CommonResult<List<String>> submitErp(@RequestBody List<Long> ids) {
return success(contractService.submitErp(ids));
}

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java
View File

@@ -105,7 +105,7 @@ public interface ContractService {
* @param ids 合同ID集合
* @return
*/
Boolean submitErp(List<Long> ids);
List<String> submitErp(List<Long> ids);
/**
* 删除合同

74
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

8
zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/ErpSubmitReqDTO.java
View File

@@ -22,11 +22,17 @@ public class ErpSubmitReqDTO {
* "sign": 签名，uuid+srcsys+密码，MD5 32位小写签名，密码另行约定
* "req": {具体参数，参见RFC功能列表}
*/
@Schema(description = "接口编号，必须，参见RFC功能列表，可调用接口编号范围051-900")
private String funcnr;
@Schema(description = "调用系统业务单据编号，必须，在外部系统唯一，用于关联")
private String bskey;
@Schema(description = "SAP系统ID, 必须")
private String usrid;
@Schema(description = "源调用系统ID，必须")
private String usrnm;
private String sign;
// @Schema(description = "签名，uuid+srcsys+密码，MD5 32位小写签名，密码另行约定")
// private String sign;
@Schema(description = "具体参数，参见RFC功能列表")
private Map<String, Object> req;
}

8
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpProductiveVersionServiceImpl.java
View File

@@ -159,13 +159,13 @@ public class ErpProductiveVersionServiceImpl implements ErpProductiveVersionServ
JSONObject dataJson = dataArray.getJSONObject(i);
if (dataJson != null) {
ErpProductiveVersionDO DO = new ErpProductiveVersionDO();
DO.setFactoryNumber(dataJson.getString("MATNR") != null ? dataJson.getString("MATNR").trim() : null);
DO.setMaterialNumber(dataJson.getString("WERKS") != null ? dataJson.getString("WERKS").trim() : null);
DO.setFactoryNumber(dataJson.getString("WERKS") != null ? dataJson.getString("WERKS").trim() : null);
DO.setMaterialNumber(dataJson.getString("MATNR") != null ? dataJson.getString("MATNR").trim() : null);
DO.setProductiveVersionNumber(dataJson.getString("VERID") != null ? dataJson.getString("VERID").trim() : null);
DO.setProductiveVersionName(dataJson.getString("TEXT1"));
DO.setBomNumber(dataJson.getString("STLAL"));
DO.setBlineGroup(dataJson.getString("PLNNR"));
String alnalValue = dataJson.getString("ALNAL");
DO.setBlineGroup(dataJson.getString("ALNAL"));
String alnalValue = dataJson.getString("PLNNR");
// 修复：增加对空字符串的判断
DO.setGroupCount(alnalValue != null && !alnalValue.trim().isEmpty() ? Long.valueOf(alnalValue.trim()) : null);
String number = dataJson.getString("MATNR").trim() + "-" + dataJson.getString("WERKS").trim() + "-" + dataJson.getString("VERID").trim();

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

@@ -107,9 +107,6 @@ public class ErpConfig {
requestBody.put("bskey", reqDTO.getBskey());
requestBody.put("usrid", reqDTO.getUsrid());
requestBody.put("usrnm", reqDTO.getUsrnm());
if (reqDTO.getSign() != null) {
requestBody.put("sign", reqDTO.getSign());
}
if (reqDTO.getReq() != null) {
requestBody.put("req", reqDTO.getReq());
}