代码备份

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

@@ -388,7 +388,6 @@ public class IoCodeTempController extends BaseController {
 
         //三期校验
         if (bussinessTypeEntity.isCodeFillCheck()) {
-
             BaseResponse checkOriginCodeRes = checkOriginCode(udiEntity);
             if (checkOriginCodeRes != null) {
                 IoCodeLostEntity codeLostEntity = codeLostService.findByCode(code);
@@ -406,7 +405,6 @@ public class IoCodeTempController extends BaseController {
                     udiEntity.setExpireDate(codeLostEntity.getExpireDate());
                     udiEntity.setProduceDate(codeLostEntity.getProduceDate());
                 }
-
                 if (StrUtil.isNotEmpty(orderId)) {
                     List<IoCodeTempEntity> ioCodeEnttities = codeTempService.findByOrderId(orderId);
                     IoCodeTempEntity ioCodeEnttity = isExitLocal(code, ioCodeEnttities);
@@ -416,6 +414,16 @@ public class IoCodeTempController extends BaseController {
                 } else
                     return checkOriginCodeRes;
             }
+        } else {
+            BaseResponse checkOriginCodeRes = checkOriginCode(udiEntity);
+            if (checkOriginCodeRes != null) {
+                IoCodeLostEntity codeLostEntity = codeLostService.findByCode(code);
+                if (codeLostEntity != null) {
+                    udiEntity.setBatchNo(codeLostEntity.getBatchNo());
+                    udiEntity.setExpireDate(codeLostEntity.getExpireDate());
+                    udiEntity.setProduceDate(codeLostEntity.getProduceDate());
+                }
+            }
         }
 
 

src/main/java/com/glxp/api/controller/purchase/PurOrderController.java

@@ -187,6 +187,8 @@ public class PurOrderController {
                 }
                 purOrderService.deleteById(id);
                 purOrderDetailService.deleteByOrderId(id + "");
+            } else {
+                purOrderService.update(purOrderEntity);
             }
         }
         purChangeService.purOrderChange(purOrderEntity);

src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java

@@ -747,6 +747,7 @@ public class IoCheckInoutService {
                         bizEntity.setCheckSuccess(true);
                         codeResponse.setCheckSuccess(true);
                         codeResponse.setOrderCount(bizEntity.getCount());
+                        codeResponse.setPrice(bizEntity.getPrice());
                     } else {
                         codeResponse.setCheckSuccess(false);
                         codeResponse.setOrderCount(bizEntity.getCount());

src/main/resources/schemas/schema_v2.1.sql

@@ -598,7 +598,7 @@ CREATE TABLE if not exists `io_destiny_process_detail`
 
 
 CALL Pro_Temp_ColumnWork('io_order', 'outSickInfo', 'varchar(255)', 1);
-
+CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode',
                          'varchar(255) ', 1);