UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

待审核单据

Browse Source
dev_unify
yewj 11 months ago
parent 57b60cddc0
commit c88e431977
4 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File

3
src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
Unescape Escape View File

@ -178,7 +178,8 @@ public class IoCollectOrderController extends BaseController {
if (IntUtil.value(collectSet.getAutoAllotOrder())) { if (IntUtil.value(collectSet.getAutoAllotOrder())) {
request.setTagStatus(1); request.setTagStatus(1);
orderResponses = collectOrderService.filterList(request); orderResponses = collectOrderService.filterList(request);
return ResultVOUtils.success(orderResponses.get(0)); if (orderResponses != null)
return ResultVOUtils.success(orderResponses.get(0));
} }
} }
} }

17
src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
Unescape Escape View File

@ -1637,11 +1637,12 @@ public class IoCodeTempController extends BaseController {
else else
return ResultVOUtils.error(500, "当前供应商不存在此配送产品！"); return ResultVOUtils.error(500, "当前供应商不存在此配送产品！");
} }
if (!(bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN) || bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT))) {
//校验供应商是否配送此产品 //校验供应商是否配送此产品
BaseResponse corpResponse = checkCorp(codeEnttity, bussinessTypeEntity, unitFk); BaseResponse corpResponse = checkCorp(codeEnttity, bussinessTypeEntity, unitFk);
if (corpResponse != null) { if (corpResponse != null) {
return corpResponse; return corpResponse;
}
} }
IoOrderEntity isExit = orderService.findByBillNo(orderId); IoOrderEntity isExit = orderService.findByBillNo(orderId);
@ -1814,7 +1815,7 @@ public class IoCodeTempController extends BaseController {
} else } else
codeTempService.insert(codeEnttity); codeTempService.insert(codeEnttity);
// 查询是否存在药品关联信息 后将结果更新至 temp表 // 查询是否存在药品关联信息 后将结果更新至 temp表
updateRelCode(bussinessTypeEntity,code); updateRelCode(bussinessTypeEntity, code);
// relCodeBatchService.threadUpdateIoCodeTempEntity(code); // relCodeBatchService.threadUpdateIoCodeTempEntity(code);
// } else if (bussinessTypeEntity.getCheckWebNew() == 2 && bussinessTypeEntity.isCheckEnable()) { // } else if (bussinessTypeEntity.getCheckWebNew() == 2 && bussinessTypeEntity.isCheckEnable()) {
} else if (IntUtil.value(addOrderRequest.getOrderType()) == ConstantStatus.ORDER_TYPE_WAIT && bussinessTypeEntity.isCheckEnable()) { } else if (IntUtil.value(addOrderRequest.getOrderType()) == ConstantStatus.ORDER_TYPE_WAIT && bussinessTypeEntity.isCheckEnable()) {
@ -1824,12 +1825,12 @@ public class IoCodeTempController extends BaseController {
} else } else
codeTempService.insert(codeEnttity); codeTempService.insert(codeEnttity);
// 异步调用 查询是否存在药品关联信息 后将结果更新至 temp表 // 异步调用 查询是否存在药品关联信息 后将结果更新至 temp表
updateRelCode(bussinessTypeEntity,code); updateRelCode(bussinessTypeEntity, code);
// relCodeBatchService.threadUpdateIoCodeTempEntity(code); // relCodeBatchService.threadUpdateIoCodeTempEntity(code);
} else { } else {
checkPrice(codeEnttity, bussinessTypeEntity, inBatch, codeEnttitys); checkPrice(codeEnttity, bussinessTypeEntity, inBatch, codeEnttitys);
codeTempService.insert(codeEnttity); codeTempService.insert(codeEnttity);
updateRelCode(bussinessTypeEntity,code); updateRelCode(bussinessTypeEntity, code);
// 查询是否存在药品关联信息 后将结果更新至 temp表 // 查询是否存在药品关联信息 后将结果更新至 temp表
// relCodeBatchService.threadUpdateIoCodeTempEntity(code); // relCodeBatchService.threadUpdateIoCodeTempEntity(code);

20
src/main/java/com/glxp/api/service/sync/HeartService.java
Unescape Escape View File

@ -1521,16 +1521,16 @@ public class HeartService {
orderEntity.setId(null); orderEntity.setId(null);
orderService.insertOrder(orderEntity); orderService.insertOrder(orderEntity);
insetOrderDb(syncDataResponse, orderEntity); insetOrderDb(syncDataResponse, orderEntity);
orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); // orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) { // if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) {
addInoutService.dealProcess(orderEntity); // addInoutService.dealProcess(orderEntity);
} else if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_TEMP_SAVE && orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) { // } else if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_TEMP_SAVE && orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) {
addInoutService.dealProcess(orderEntity); // addInoutService.dealProcess(orderEntity);
orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); // orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
if (orderEntity.getStatus() != ConstantStatus.ORDER_STATS_ERROR && !ioCheckInoutService.checkManual(orderEntity.getBillNo())) { // if (orderEntity.getStatus() != ConstantStatus.ORDER_STATS_ERROR && !ioCheckInoutService.checkManual(orderEntity.getBillNo())) {
ioCheckInoutService.check(orderEntity.getBillNo()); // ioCheckInoutService.check(orderEntity.getBillNo());
} // }
} // }
} else { } else {
updateOrderDb(syncDataResponse, orderEntity); updateOrderDb(syncDataResponse, orderEntity);
} }

2
src/main/resources/application-dev.yml
Unescape Escape View File

@ -4,7 +4,7 @@ server:
spring: spring:
datasource: datasource:
driver-class-name: com.p6spy.engine.spy.P6SpyDriver driver-class-name: com.p6spy.engine.spy.P6SpyDriver
jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true jdbc-url: jdbc:p6spy:mysql://192.168.0.44:3306/udiwma81?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root username: root
password: 123456 password: 123456
hikari: hikari:

Write Preview
Loading…
Cancel
Save