weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

非通宇 保税仓入口订单推送;

Browse Source
This commit is contained in:
王奎兴
2026-06-11 15:14:05 +08:00
parent 8a463f52fc
commit 4f2855a2c5
10 changed files with 53 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/vo/GwInDetail.java
+6 -6
View File
@@ -7,13 +7,13 @@ import java.math.BigDecimal;
@Data
public class GwInDetail {
//订单号
private String bill_no;
private String billNo;
//订单行号
private String line_num;
private String lineNum;
//物料号
private String item_no;
private String itemNo;
//物料名称
private String item_name;
private String itemName;
//物料规格
private String spec;
//计量单位
@@ -21,9 +21,9 @@ public class GwInDetail {
//数量
private BigDecimal qty;
//企业币制
private String erp_curr;
private String erpCurr;
//企业单价
private BigDecimal erp_price;
private BigDecimal erpPrice;
//申报总价
private BigDecimal amount;
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/vo/GwStockInOrder.java
+4 -4
View File
@@ -8,13 +8,13 @@ import java.util.List;
@Data
public class GwStockInOrder {
//订单号
private String bill_no;
private String billNo;
//进出标记
private String ie_flag;
private String ieFlag;
//下单日期
private Date bill_date;
private Date billDate;
//客户代码
private String corp_code;
private String corpCode;
private List<GwInDetail> orderList;
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java
+18 -16
View File
@@ -284,11 +284,11 @@ public class ReservationStockInOrderApplicationService {
*/
public Boolean auditState(ReservationStockInOrderDO stockInOrderDO){
Integer issueStatus = stockInOrderDO.getIssueStatus();
if (issueStatus == 2) {
List<Long> idList = new ArrayList();
idList.add(stockInOrderDO.getInOrderId());
batchPush(idList);
}
// if (issueStatus == 2) {
// List<Long> idList = new ArrayList();
// idList.add(stockInOrderDO.getInOrderId());
// batchPush(idList);
// }
return stockInOrderDomainService.auditState(stockInOrderDO);
}
@@ -1960,33 +1960,35 @@ public class ReservationStockInOrderApplicationService {
ReservationStockInOrder reservationStockInOrder = reservationStockInOrderMapper.selectById(id);
Long shipperId = reservationStockInOrder.getShipperId();
String userNcCode = reservationStockInOrderMapper.getUserNcCode(shipperId);
gwStockInOrder.setBill_no(reservationStockInOrder.getInOrderNumber());
gwStockInOrder.setBill_date(reservationStockInOrder.getDocumentDate());
gwStockInOrder.setIe_flag("I");
gwStockInOrder.setCorp_code(userNcCode);
gwStockInOrder.setBillNo(reservationStockInOrder.getInOrderNumber());
gwStockInOrder.setBillDate(reservationStockInOrder.getDocumentDate());
gwStockInOrder.setIeFlag("I");
gwStockInOrder.setCorpCode(userNcCode);
List<ReservationInMaterialDetail> reservationInMaterialDetails = reservationInMaterialDetailMapper.selectList(new LambdaQueryWrapper<ReservationInMaterialDetail>().eq(ReservationInMaterialDetail::getInOrderNumber, reservationStockInOrder.getInOrderNumber()));
List<ReservationInMaterialDetail> reservationInMaterialDetails = reservationInMaterialDetailMapper.selectList(new LambdaQueryWrapper<ReservationInMaterialDetail>().eq(ReservationInMaterialDetail::getInOrderNumber, reservationStockInOrder.getInOrderNumber()).eq(ReservationInMaterialDetail::getDelFlag, 1));
List<GwInDetail> orderList = new LinkedList<>();
for (ReservationInMaterialDetail reservationInMaterialDetail : reservationInMaterialDetails) {
GwInDetail gwInDetail = new GwInDetail();
Long materialBaseInfoId = reservationInMaterialDetail.getMaterialBaseInfoId();
gwInDetail.setBill_no(gwStockInOrder.getBill_no());
gwInDetail.setBillNo(gwStockInOrder.getBillNo());
String lotNo = reservationInMaterialDetail.getLotNo();
if (lotNo != null) {
String[] split = lotNo.split("-");
if (split.length == 2) {
gwInDetail.setLine_num(split[1]);
gwInDetail.setLineNum(split[1]);
} else {
gwInDetail.setLineNum("");
}
}
gwInDetail.setItem_no(materialBaseInfoId.toString());
gwInDetail.setItem_name(reservationInMaterialDetail.getMaterialName());
gwInDetail.setItemNo(materialBaseInfoId.toString());
gwInDetail.setItemName(reservationInMaterialDetail.getMaterialName());
MaterialBaseInfoPO materialBaseInfoPO = reservationStockInOrderMapper.getinfo(materialBaseInfoId);
gwInDetail.setSpec(materialBaseInfoPO.getSpecificationModel());
gwInDetail.setUnit(materialBaseInfoPO.getDeclarationUnit());
gwInDetail.setQty(reservationInMaterialDetail.getQuantity());
gwInDetail.setErp_curr(materialBaseInfoPO.getCurrency());
gwInDetail.setErp_price(materialBaseInfoPO.getUnitPrice());
gwInDetail.setErpCurr(materialBaseInfoPO.getCurrency());
gwInDetail.setErpPrice(materialBaseInfoPO.getUnitPrice());
BigDecimal unitPrice = materialBaseInfoPO.getUnitPrice();
BigDecimal quantity = reservationInMaterialDetail.getQuantity();
if (unitPrice != null && quantity != null && unitPrice.compareTo(BigDecimal.ZERO) != 0&&quantity.compareTo(BigDecimal.ZERO) != 0) {
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java
+1
View File
@@ -1124,6 +1124,7 @@ public class ReservationStockOutOrderApplicationService {
reservationOutMaterialDetailMapper.selectList(
new LambdaQueryWrapper<ReservationOutMaterialDetail>()
.eq(ReservationOutMaterialDetail::getOutOrderNumber, reservationStockOutOrder.getOutOrderNumber())
.eq(ReservationOutMaterialDetail::getDelFlag, 1)
);
if (reservationOutMaterialDetails == null || reservationOutMaterialDetails.isEmpty()) {
mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java
+2 -1
View File
@@ -753,7 +753,8 @@ public class PickingOrderApplicationService {
pickingMaterialDetailDO.setPickingOrderNumber(pickingOrder.getPickingOrderNumber());
List<PickingMaterialDetailPO> materialDetailList = pickingMaterialDetailService.queryList(pickingMaterialDetailDO);
List<OutMaterialDetail> outMaterialDetailList = outMaterialDetailService.list(new QueryWrapper<OutMaterialDetail>().lambda()
.eq(OutMaterialDetail::getOutOrderNumber, pickingOrder.getOrderNumber()));
.eq(OutMaterialDetail::getOutOrderNumber, pickingOrder.getOrderNumber())
.eq(OutMaterialDetail::getDelFlag, 1));
if (outMaterialDetailList == null || outMaterialDetailList.isEmpty()) {
failCount++;
failMsg.append("id:").append(id).append("无物料明细;");
mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
+3 -1
View File
@@ -2306,7 +2306,9 @@ public class StockInOrderApplicationService {
gwStockInOrder.setCorp_code(userNcCode);
List<InMaterialDetail> reservationInMaterialDetails = inMaterialDetailService.list(new LambdaQueryWrapper<InMaterialDetail>().eq(InMaterialDetail::getInOrderNumber, stockInOrder.getInOrderNumber()));
List<InMaterialDetail> reservationInMaterialDetails = inMaterialDetailService.list(new LambdaQueryWrapper<InMaterialDetail>().
eq(InMaterialDetail::getInOrderNumber, stockInOrder.getInOrderNumber())
.eq(InMaterialDetail::getDelFlag, 1));
List<GwInDetail> orderList = new LinkedList<>();
for (InMaterialDetail reservationInMaterialDetail : reservationInMaterialDetails) {
GwInDetail gwInDetail = new GwInDetail();
mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
+2 -1
View File
@@ -116,7 +116,7 @@ public class StockOutOrderApplicationService {
@Autowired
private StockOutOrderMapper stockOutOrderMapper;
private static final String PUSH_API_URL = "http://10.33.0.100/nagu-erp-api/transfer/pushData";
private static final String API_NAME = "save_order_i";
private static final String API_NAME = "save_order_e";
private static final String VERIFY = "ESLuxAmB6VXCgbqP1eFzxTPVRagkQ62BUkfhElrgQ6XmE/g2reHVflY/SiCSU7JD";
/**
@@ -1528,6 +1528,7 @@ public class StockOutOrderApplicationService {
outMaterialDetailService.list(
new LambdaQueryWrapper<OutMaterialDetail>()
.eq(OutMaterialDetail::getOutOrderNumber, stockOutOrder.getOutOrderNumber())
.eq(OutMaterialDetail::getDelFlag, 1)
);
if (outMaterialDetails == null || outMaterialDetails.isEmpty()) {
mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java
+1 -1
View File
@@ -127,7 +127,7 @@ public class StockShelfOrderApplicationService {
@Autowired
private IStockShelfOrderService stockShelfOrderService;
private static final String PUSH_API_URL = "http://10.33.0.100/nagu-erp-api/transfer/pushData";
private static final String API_NAME = "save_order_i";
private static final String API_NAME = "save_qnBill_i";
private static final String VERIFY = "ESLuxAmB6VXCgbqP1eFzxTPVRagkQ62BUkfhElrgQ6XmE/g2reHVflY/SiCSU7JD";
mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java
+8
View File
@@ -199,5 +199,13 @@ public class StockInOrderApi extends BaseController {
result.put("detailList", detailList == null ? Collections.emptyList() : detailList);
return AjaxResult.success(result);
}
@ApiOperation("通宇-进口订单推送")
@PostMapping("/batchPush")
public AjaxResult batchPush(@RequestBody List<Long> idList){
if(idList == null || idList.isEmpty()){
return AjaxResult.error("没有数据需要推送");
}
return stockInOrderApplicationService.batchPush(idList);
}
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java
+8 -1
View File
@@ -464,5 +464,12 @@ public class StockOutOrderApi extends BaseController {
fillNoticePrintTitle(result, stockOutOrderDTO);
return result;
}
@ApiOperation("通宇-出口订单推送")
@PostMapping("/batchPush")
public AjaxResult batchPush(@RequestBody List<Long> idList){
if(idList == null || idList.isEmpty()){
return AjaxResult.error("没有数据需要推送");
}
return stockOutOrderApplicationService.batchPush(idList);
}
}