库存，单据，扫码数量修改

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

@@ -1360,7 +1360,7 @@ public class IoCodeTempController extends BaseController {
     @Autowired
     RelCodeBatchService relCodeBatchService;
 
-//    @Transactional(rollbackFor = Exception.class)
+    //    @Transactional(rollbackFor = Exception.class)
     public BaseResponse addDrugOrder(AddOrderRequest addOrderRequest, UdiEntity udiEntity, String code) {
         AddCodeResult addCodeResult = new AddCodeResult();
         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderRequest.getAction());
@@ -1935,7 +1935,6 @@ public class IoCodeTempController extends BaseController {
     }
 
 
-
     public void updateRelCode(BasicBussinessTypeEntity bussinessTypeEntity, String code) {
         if (!(bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT) || bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN)))
             relCodeBatchService.threadUpdateIoCodeTempEntity(code);

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

@@ -129,8 +129,6 @@ public class IoSplitFifoInvController extends BaseController {
     }
 
 
-
-
     @GetMapping("/udiwms/ioSplit/inv/exportExcel")
     public void exportExcel(IoSplitFifoInvRequest ioSplitFifoInvRequest, HttpServletResponse response) throws IOException {
         // 模拟数据库获取数据

src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java

@@ -397,7 +397,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                             .updateUser(1l)
                             .scanCount(1)
                             .isSplitCode(false)
-                            .scanActCount(1)
+                            .scanActCount(codeEntity.getMyReCount())
                             .build());
                 }
                 collectOrderCodeManService.saveBatch(collectOrderCodeManList);

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

@@ -98,7 +98,7 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
                     splitCodeEntity.setWorkPlaceCode(orderEntity.getWorkPlaceCode());
                     splitCodeEntity.setWorkPlaceQueueCode(orderEntity.getWorkPlaceQueueCode());
                     splitCodeEntity.setFifoSplit(codeEntity.getFifoSplit());
-                    UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByRelId(codeEntity.getRelId() + "");
+//                    UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByRelId(codeEntity.getRelId() + "");
 //                    if (udiRelevanceResponse != null) {
 //                        splitCodeEntity.setYbbm(udiRelevanceResponse.getYbbm());
 //                    }
@@ -130,6 +130,7 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
                         .productType(ioSplitFifoCodeEntity.getProductType())
                         .fifoSplit(ioSplitFifoCodeEntity.getFifoSplit())
                         .relId(ioSplitFifoCodeEntity.getRelId())
+                        .inCodeCount(ioSplitFifoCodeEntity.getScanCount())
                         .batchNo(ioSplitFifoCodeEntity.getBatchNo())
                         .produceDate(ioSplitFifoCodeEntity.getProduceDate())
                         .expireDate(ioSplitFifoCodeEntity.getExpireDate())

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://192.168.0.43:3306/udi_wms_cl?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_cl?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:
@@ -59,4 +59,6 @@ back_file_path: D:/share/udisps/back/
 API_KEY: 1101
 API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ6L
 WEB_TITLE: 平潭协和医院
+SYST_NAME: 天眼UDI管理系统
+LOGO_URL: http://192.168.0.166:9150/log.jpg
 SPMS_WEBSOCKET_TOKEN: 07rKFDFkQvBkbxgc7aUBlONo4gWNdx8b