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-12 16:09:19 +08:00
parent c0d3372e0c
commit 36cd52a701
4 changed files with 52 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
+5
View File
@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.33.0.99:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
@@ -57,4 +58,8 @@ public interface OmsServiceFeign {
@ApiOperation("修改gwlog")
@PostMapping("/gwLogApi/updateGwLog")
AjaxResult updateGwLog(@RequestBody GwLogDTO gwLogDTO);
@ApiOperation("批量推送")
@PostMapping("/reservationStockOutOrderApi/batchPush")
public AjaxResult batchPush(@RequestBody List<Long> idList);
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java
+14 -7
View File
@@ -283,13 +283,20 @@ public class ReservationStockInOrderApplicationService {
* @return Boolean
*/
public Boolean auditState(ReservationStockInOrderDO stockInOrderDO){
Integer issueStatus = stockInOrderDO.getIssueStatus();
// if (issueStatus == 2) {
// List<Long> idList = new ArrayList();
// idList.add(stockInOrderDO.getInOrderId());
// batchPush(idList);
// }
return stockInOrderDomainService.auditState(stockInOrderDO);
Boolean b = stockInOrderDomainService.auditState(stockInOrderDO);
Integer needCustomsDeclaration = stockInOrderDO.getNeedCustomsDeclaration();
Integer auditStatus = stockInOrderDO.getAuditStatus();
try {
if (needCustomsDeclaration != null && needCustomsDeclaration == 1 && auditStatus != null && auditStatus == 2) {
Long inOrderId = stockInOrderDO.getInOrderId();
List<Long> idList = new ArrayList<>();
idList.add(inOrderId);
batchPush(idList);
}
} catch (Exception e) {
throw new ServiceException("推送关务系统失败!");
}
return b;
}
/**
mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
+14 -1
View File
@@ -494,7 +494,20 @@ public class StockInOrderApplicationService {
* @return Boolean
*/
public Boolean auditState(StockInOrderDO stockInOrderDO){
return stockInOrderDomainService.auditState(stockInOrderDO);
Boolean b = stockInOrderDomainService.auditState(stockInOrderDO);
Integer needCustomsDeclaration = stockInOrderDO.getNeedCustomsDeclaration();
Integer auditStatus = stockInOrderDO.getAuditStatus();
try {
if (needCustomsDeclaration != null && needCustomsDeclaration == 1 && auditStatus != null && auditStatus == 3) {
Long inOrderId = stockInOrderDO.getInOrderId();
List<Long> idList = new ArrayList<>();
idList.add(inOrderId);
batchPush(idList);
}
} catch (Exception e) {
throw new ServiceException("推送关务系统失败!");
}
return b;
}
mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
+19 -1
View File
@@ -1000,7 +1000,25 @@ public class StockOutOrderApplicationService {
* @return Boolean
*/
public Boolean genPickingOrder(StockOutOrderDO stockOutOrderDO){
return stockOutOrderDomainService.genPickingOrder(stockOutOrderDO);
Boolean b = stockOutOrderDomainService.genPickingOrder(stockOutOrderDO);
String needDeclareFlag = stockOutOrderDO.getNeedDeclareFlag();
Long organizationId = stockOutOrderDO.getOrganizationId();
try {
if (needDeclareFlag != null && "1".equals(needDeclareFlag) && organizationId != null && organizationId == 2830) {
Long outOrderId = stockOutOrderDO.getOutOrderId();
List<Long> ids = new ArrayList<>();
ids.add(outOrderId);
batchPush(ids);
} else {
Long outOrderId = stockOutOrderDO.getOutOrderId();
List<Long> ids = new ArrayList<>();
ids.add(outOrderId);
omsServiceFeign.batchPush(ids);
}
} catch (Exception e) {
throw new ServiceException("生成报关单失败");
}
return b;
}
/**