mes/nalinv-int
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://10.10.11.66:3000/mes/nalinv-int into dev

Browse Source
This commit is contained in:
syngna_qiao 2025-01-03 10:47:35 +08:00
commit 9570f8c199
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
int-api/src/main/java/com/foreverwin/iep/integration/dto/SapWmsDispatchNoteDTO.java
View File

@ -1,6 +1,7 @@
package com.foreverwin.iep.integration.dto;
import com.alibaba.fastjson.JSONArray;
import com.google.gson.annotations.SerializedName;
import lombok.Data;
@ -173,25 +174,25 @@ public class SapWmsDispatchNoteDTO {
* 客户要货附件地址
*/
@SerializedName("Z003")
private String z003;
private JSONArray z003;
/**
* 客户出库附件地址
*/
@SerializedName("Z004")
private String z004;
private JSONArray z004;
/**
* 仓库出库附件地址
*/
@SerializedName("Z005")
private String z005;
private JSONArray z005;
/**
* 客户签收附件地址
*/
@SerializedName("Z006")
private String z006;
private JSONArray z006;
/**
* 发货单同步接口明细

5
int-core/src/main/java/com/foreverwin/iep/integration/handler/def/job/SapMaterielReceiveForWorkJob.java
View File

@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.foreverwin.iep.integration.component.Invoke;
import com.foreverwin.iep.integration.constant.Msg;
import com.foreverwin.iep.integration.domain.InvokeRequest;
import com.foreverwin.iep.integration.handler.def.sap.SapUtil;
import com.foreverwin.iep.integration.utils.JS;
@ -56,10 +57,10 @@ public class SapMaterielReceiveForWorkJob {
jsonBody.put("REQ_ID", uuid);
jsonBody.put("KEY_VALUE", "itemSync");
jsonBody.put("SEND_TIME", nowTime);
jsonBody.put("SENDER", "ERP");
jsonBody.put("SENDER", Msg.IEP);
jsonBody.put("START", nowTime);
jsonBody.put("MESSAGE_ID", "SAP_MATERIEL_RECEIVE");
jsonBody.put("RECEIVER", "IEP");
jsonBody.put("RECEIVER", Msg.ERP);
jsonBody.put("RETRY", false);
JSONObject jsonObject = new JSONObject();
jsonObject.put("RFC_FUNCTION", "ZPP_MES_MATNR_GET");

4
int-core/src/main/java/com/foreverwin/iep/integration/handler/def/sap/SapDispatchNote.java
View File

@ -2,6 +2,8 @@ package com.foreverwin.iep.integration.handler.def.sap;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONArray;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.foreverwin.iep.integration.constant.Msg;
import com.foreverwin.iep.integration.domain.InvokeRequest;
@ -57,6 +59,8 @@ public class SapDispatchNote implements HandlerService {
zWmsDispatchNoteItf.setDateCreate(nowLocalDateTime);
zWmsDispatchNoteItf.setResponseStatus(Msg.S);
zWmsDispatchNoteItf.setResponseDescription(Msg.SUCCESS);
zWmsDispatchNoteItf.setZ003JsonArray(sapWmsDispatchNoteDTO.getZ003());
zWmsDispatchNoteItf.setZ004JsonArray(sapWmsDispatchNoteDTO.getZ004());
// 手动复制list明细
List<SapWmsDispatchNoteDetailDTO> sapWmsDispatchNoteDetailDTOList = sapWmsDispatchNoteDTO.getSapWmsDispatchNoteDetailDTOList();
List<ZWmsDispatchNoteDetailItf> zWmsDispatchNoteDetailItfList = new ArrayList<>();

11
int-core/src/main/java/com/foreverwin/iep/integration/handler/def/sap/SapInShopOrder.java
View File

@ -30,10 +30,7 @@ import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.*;
/**
* 工单同步调用接口
@ -289,7 +286,7 @@ public class SapInShopOrder implements HandlerService {
int flag = 0;
// 工单类型
String orderType = customFieldsList.get(0).getOrderType();
// 工单类型不校验BOM
// 工单类型不校验BOM（保密生产订单）
URL.setSite(invokeRequest.getSite()); // 不知道为啥这里需要多设置一步，否则后面查询不到
List<SysDictItem> erpShopOrderTypeList = remoteDictService.getDictByType("ERP_SHOP_ORDER_TYPE", SecurityConstants.FROM_IN).getData();
if (CollectionUtils.isNotEmpty(erpShopOrderTypeList) && StrUtil.isNotBlank(orderType)) {
@ -298,6 +295,10 @@ public class SapInShopOrder implements HandlerService {
flag = 1;
}
}
// 关单不校验BOM
if (Objects.equals("CLOSED", sapInShopOrderDTO.getShopOrderStatus())) {
flag = 1;
}
if (flag == 0) {
// BOM组件信息
List<SapInShopOrderBomComponentDTO> bomComponentList = sapInShopOrderDTO.getBomComponentList();