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-11-25 16:43:22 +08:00
parent a533b1eb49 176933b606
commit f8522ef6ae
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,4 +34,8 @@ public class ErpInternalOrderRespVO {
@ExcelProperty("是否已完成")
private String isFinish;
@Schema(description = "companyNumber")
@ExcelProperty("companyNumber")
private String companyNumber;
}

6
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpInternalOrderDO.java
View File

@@ -53,4 +53,10 @@ public class ErpInternalOrderDO {
@TableField("IS_FIN")
private String isFinish;
/**
* 公司编码
*/
@TableField("CPN_NUM")
private String companyNumber;
}

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

@@ -132,6 +132,13 @@ public class ErpInternalOrderServiceImpl implements ErpInternalOrderService {
if (dataArray == null || dataArray.isEmpty()) {
continue;
}
// 往每个子项中添加BUKRS字段
for (int j = 0; j < dataArray.size(); j++) {
JSONObject item = dataArray.getJSONObject(j);
if (item != null) {
item.put("BUKRS", number);
}
}
dataArrayALL.addAll(dataArray);
}
if (CollUtil.isEmpty(dataArrayALL)) {
@@ -165,6 +172,7 @@ public class ErpInternalOrderServiceImpl implements ErpInternalOrderService {
DO.setType(dataJson.getString("AUART"));
DO.setIsOff(dataJson.getString("PHAS3"));
DO.setIsFinish(dataJson.getString("PHAS2"));
DO.setCompanyNumber(dataJson.getString("BUKRS"));
if (numbers.get(number) != null) {
// 更新
DO.setId(numbers.get(number));