切换分支备份

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -586,9 +586,9 @@ public class IoCodeTempController extends BaseController {
 
                 BaseResponse invRes = null;
                 if (bussinessTypeEntity.isScanPreIn()) {    //校验预验收库存
-                    invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity,false);
+                    invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity, false);
                 } else if (bussinessTypeEntity.isAdvancePreIn()) {  //校验寄售库存
-                    invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity,false);
+                    invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity, false);
                 } else {
                     invRes = checkInv(bussinessTypeEntity, genDetaiEntity, false);
                 }
@@ -742,13 +742,13 @@ public class IoCodeTempController extends BaseController {
 
 
             if (bussinessTypeEntity.isScanPreIn()) {    //校验预验收库存
-                BaseResponse invRes = checkPreInInv(bussinessTypeEntity, codeEnttity,false);
+                BaseResponse invRes = checkPreInInv(bussinessTypeEntity, codeEnttity, false);
                 if (invRes != null) {
                     deleteEmptyBillNo(orderEntity);
                     return invRes;
                 }
             } else if (bussinessTypeEntity.isAdvancePreIn()) {  //校验寄售库存
-                BaseResponse invRes = checkPreInv(bussinessTypeEntity, codeEnttity,false);
+                BaseResponse invRes = checkPreInv(bussinessTypeEntity, codeEnttity, false);
                 if (invRes != null) {
                     deleteEmptyBillNo(orderEntity);
                     return invRes;
@@ -1234,6 +1234,7 @@ public class IoCodeTempController extends BaseController {
 
 
     public void deleteEmptyBillNo(IoOrderEntity orderEntity) {
+        if (orderEntity != null) {
             boolean r1 = orderDetailBizService.isExit(orderEntity.getBillNo());
             boolean r2 = ioOrderDetailCodeService.isExit(orderEntity.getBillNo());
             boolean r3 = codeTempService.isExit(orderEntity.getBillNo());
@@ -1242,6 +1243,8 @@ public class IoCodeTempController extends BaseController {
             }
         }
 
+    }
+
 
     @AuthRuleAnnotation("")
     @PostMapping("warehouse/inout/saveTempCode")
@@ -1574,9 +1577,9 @@ public class IoCodeTempController extends BaseController {
 
                 BaseResponse invRes = null;
                 if (bussinessTypeEntity.isScanPreIn()) {    //校验预验收库存
-                    invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity,false);
+                    invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity, false);
                 } else if (bussinessTypeEntity.isAdvancePreIn()) {  //校验寄售库存
-                    invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity,false);
+                    invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity, false);
                 } else {
                     invRes = checkInv(bussinessTypeEntity, genDetaiEntity, false);
                 }
@@ -1729,13 +1732,13 @@ public class IoCodeTempController extends BaseController {
 
 
             if (bussinessTypeEntity.isScanPreIn()) {    //校验预验收库存
-                BaseResponse invRes = checkPreInInv(bussinessTypeEntity, codeEnttity,false);
+                BaseResponse invRes = checkPreInInv(bussinessTypeEntity, codeEnttity, false);
                 if (invRes != null) {
                     deleteEmptyBillNo(orderEntity);
                     return invRes;
                 }
             } else if (bussinessTypeEntity.isAdvancePreIn()) {  //校验寄售库存
-                BaseResponse invRes = checkPreInv(bussinessTypeEntity, codeEnttity,false);
+                BaseResponse invRes = checkPreInv(bussinessTypeEntity, codeEnttity, false);
                 if (invRes != null) {
                     deleteEmptyBillNo(orderEntity);
                     return invRes;

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     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
     password: 123456
     hikari: