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-17 16:02:59 +08:00
parent 7cfb30e90c
commit 85068215e5
3 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java
+16 -16
View File
@@ -281,22 +281,22 @@ public class ReservationStockInOrderApplicationService {
*/ */
public Boolean auditState(ReservationStockInOrderDO stockInOrderDO){ public Boolean auditState(ReservationStockInOrderDO stockInOrderDO){
Boolean b = stockInOrderDomainService.auditState(stockInOrderDO); Boolean b = stockInOrderDomainService.auditState(stockInOrderDO);
List<Long> inOrderIds = stockInOrderDO.getInOrderIds(); // List<Long> inOrderIds = stockInOrderDO.getInOrderIds();
if (inOrderIds != null && !inOrderIds.isEmpty()) { // if (inOrderIds != null && !inOrderIds.isEmpty()) {
ReservationStockInOrder stockInOrder = reservationStockInOrderMapper.selectById(inOrderIds.get(0)); // ReservationStockInOrder stockInOrder = reservationStockInOrderMapper.selectById(inOrderIds.get(0));
Integer needCustomsDeclaration = stockInOrder.getNeedCustomsDeclaration(); // Integer needCustomsDeclaration = stockInOrder.getNeedCustomsDeclaration();
Integer auditStatus = stockInOrder.getIssueStatus(); // Integer auditStatus = stockInOrder.getIssueStatus();
try { // try {
if (needCustomsDeclaration != null && needCustomsDeclaration == 1 && auditStatus != null && auditStatus == 2) { // if (needCustomsDeclaration != null && needCustomsDeclaration == 1 && auditStatus != null && auditStatus == 2) {
Long inOrderId = stockInOrder.getInOrderId(); // Long inOrderId = stockInOrder.getInOrderId();
List<Long> idList = new ArrayList<>(); // List<Long> idList = new ArrayList<>();
idList.add(inOrderId); // idList.add(inOrderId);
batchPush(idList); // //batchPush(idList);
} // }
} catch (Exception e) { // } catch (Exception e) {
throw new ServiceException("推送关务系统失败!"); // throw new ServiceException("推送关务系统失败!");
} // }
} // }
return b; return b;
} }
mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
+16 -16
View File
@@ -495,22 +495,22 @@ public class StockInOrderApplicationService {
*/ */
public Boolean auditState(StockInOrderDO stockInOrderDO){ public Boolean auditState(StockInOrderDO stockInOrderDO){
Boolean b = stockInOrderDomainService.auditState(stockInOrderDO); Boolean b = stockInOrderDomainService.auditState(stockInOrderDO);
List<Long> inOrderIds = stockInOrderDO.getInOrderIds(); // List<Long> inOrderIds = stockInOrderDO.getInOrderIds();
if (inOrderIds != null && !inOrderIds.isEmpty()) { // if (inOrderIds != null && !inOrderIds.isEmpty()) {
StockInOrder stockInOrder = stockInOrderService.getById(inOrderIds.get(0)); // StockInOrder stockInOrder = stockInOrderService.getById(inOrderIds.get(0));
Integer needCustomsDeclaration = stockInOrder.getNeedCustomsDeclaration(); // Integer needCustomsDeclaration = stockInOrder.getNeedCustomsDeclaration();
Integer auditStatus = stockInOrder.getAuditStatus(); // Integer auditStatus = stockInOrder.getAuditStatus();
try { // try {
if (needCustomsDeclaration != null && needCustomsDeclaration == 1 && auditStatus != null && auditStatus == 3) { // if (needCustomsDeclaration != null && needCustomsDeclaration == 1 && auditStatus != null && auditStatus == 3) {
Long inOrderId = stockInOrder.getInOrderId(); // Long inOrderId = stockInOrder.getInOrderId();
List<Long> idList = new ArrayList<>(); // List<Long> idList = new ArrayList<>();
idList.add(inOrderId); // idList.add(inOrderId);
batchPush(idList); // //batchPush(idList);
} // }
} catch (Exception e) { // } catch (Exception e) {
throw new ServiceException("推送关务系统失败!"); // throw new ServiceException("推送关务系统失败!");
} // }
} // }
return b; return b;
} }
mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
+23 -23
View File
@@ -1001,29 +1001,29 @@ public class StockOutOrderApplicationService {
*/ */
public Boolean genPickingOrder(StockOutOrderDO stockOutOrderDO){ public Boolean genPickingOrder(StockOutOrderDO stockOutOrderDO){
Boolean b = stockOutOrderDomainService.genPickingOrder(stockOutOrderDO); Boolean b = stockOutOrderDomainService.genPickingOrder(stockOutOrderDO);
List<Long> outOrderIds = stockOutOrderDO.getOutOrderIds(); // List<Long> outOrderIds = stockOutOrderDO.getOutOrderIds();
if (outOrderIds != null && !outOrderIds.isEmpty()) { // if (outOrderIds != null && !outOrderIds.isEmpty()) {
StockOutOrder order = stockOutOrderService.getById(outOrderIds.get(0)); // StockOutOrder order = stockOutOrderService.getById(outOrderIds.get(0));
String needDeclareFlag = order.getNeedDeclareFlag(); // String needDeclareFlag = order.getNeedDeclareFlag();
Long organizationId = order.getOrganizationId(); // Long organizationId = order.getOrganizationId();
try { // try {
if (needDeclareFlag != null && "1".equals(needDeclareFlag) && organizationId != null) { // if (needDeclareFlag != null && "1".equals(needDeclareFlag) && organizationId != null) {
if (organizationId == 2830) { // if (organizationId == 2830) {
Long outOrderId = order.getOutOrderId(); // Long outOrderId = order.getOutOrderId();
List<Long> ids = new ArrayList<>(); // List<Long> ids = new ArrayList<>();
ids.add(outOrderId); // ids.add(outOrderId);
batchPush(ids); // //batchPush(ids);
} else { // } else {
String outOrderId = order.getOutOrderNumber(); // String outOrderId = order.getOutOrderNumber();
List<String> ids = new ArrayList<>(); // List<String> ids = new ArrayList<>();
ids.add(outOrderId); // ids.add(outOrderId);
omsServiceFeign.batchPushByNumber(ids); // //omsServiceFeign.batchPushByNumber(ids);
} // }
} // }
} catch (Exception e) { // } catch (Exception e) {
throw new ServiceException("生成报关单失败"); // throw new ServiceException("生成报关单失败");
} // }
} // }
return b; return b;
} }