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

切换分支备份

Browse Source
dev
anthonywj 2 years ago
parent 071efcdc89
commit 26d1180d2e
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File

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

@ -586,9 +586,9 @@ public class IoCodeTempController extends BaseController {
BaseResponse invRes = null; BaseResponse invRes = null;
if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存 if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存
invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity,false); invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity, false);
} else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存 } else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存
invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity,false); invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity, false);
} else { } else {
invRes = checkInv(bussinessTypeEntity, genDetaiEntity, false); invRes = checkInv(bussinessTypeEntity, genDetaiEntity, false);
} }
@ -742,13 +742,13 @@ public class IoCodeTempController extends BaseController {
if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存 if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存
BaseResponse invRes = checkPreInInv(bussinessTypeEntity, codeEnttity,false); BaseResponse invRes = checkPreInInv(bussinessTypeEntity, codeEnttity, false);
if (invRes != null) { if (invRes != null) {
deleteEmptyBillNo(orderEntity); deleteEmptyBillNo(orderEntity);
return invRes; return invRes;
} }
} else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存 } else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存
BaseResponse invRes = checkPreInv(bussinessTypeEntity, codeEnttity,false); BaseResponse invRes = checkPreInv(bussinessTypeEntity, codeEnttity, false);
if (invRes != null) { if (invRes != null) {
deleteEmptyBillNo(orderEntity); deleteEmptyBillNo(orderEntity);
return invRes; return invRes;
@ -1234,12 +1234,15 @@ public class IoCodeTempController extends BaseController {
public void deleteEmptyBillNo(IoOrderEntity orderEntity) { public void deleteEmptyBillNo(IoOrderEntity orderEntity) {
boolean r1 = orderDetailBizService.isExit(orderEntity.getBillNo()); if (orderEntity != null) {
boolean r2 = ioOrderDetailCodeService.isExit(orderEntity.getBillNo()); boolean r1 = orderDetailBizService.isExit(orderEntity.getBillNo());
boolean r3 = codeTempService.isExit(orderEntity.getBillNo()); boolean r2 = ioOrderDetailCodeService.isExit(orderEntity.getBillNo());
if (!r1 && !r2 && !r3) { boolean r3 = codeTempService.isExit(orderEntity.getBillNo());
orderService.deleteByBillNo(orderEntity.getBillNo()); if (!r1 && !r2 && !r3) {
orderService.deleteByBillNo(orderEntity.getBillNo());
}
} }
} }
@ -1574,9 +1577,9 @@ public class IoCodeTempController extends BaseController {
BaseResponse invRes = null; BaseResponse invRes = null;
if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存 if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存
invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity,false); invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity, false);
} else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存 } else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存
invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity,false); invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity, false);
} else { } else {
invRes = checkInv(bussinessTypeEntity, genDetaiEntity, false); invRes = checkInv(bussinessTypeEntity, genDetaiEntity, false);
} }
@ -1729,13 +1732,13 @@ public class IoCodeTempController extends BaseController {
if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存 if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存
BaseResponse invRes = checkPreInInv(bussinessTypeEntity, codeEnttity,false); BaseResponse invRes = checkPreInInv(bussinessTypeEntity, codeEnttity, false);
if (invRes != null) { if (invRes != null) {
deleteEmptyBillNo(orderEntity); deleteEmptyBillNo(orderEntity);
return invRes; return invRes;
} }
} else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存 } else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存
BaseResponse invRes = checkPreInv(bussinessTypeEntity, codeEnttity,false); BaseResponse invRes = checkPreInv(bussinessTypeEntity, codeEnttity, false);
if (invRes != null) { if (invRes != null) {
deleteEmptyBillNo(orderEntity); deleteEmptyBillNo(orderEntity);
return invRes; return invRes;

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_pzh?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_zyy?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