Merge remote-tracking branch 'origin/b_lms' into b_lms

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java

@@ -242,11 +242,11 @@ public class AutoCallAirShaftTask {
             } else {
                 // 右卷
                 if (SlitterConstant.SLITTER_TYPE_PAPER.equals(plan.getPaper_tube_or_FRP())) {
-                    empty.setTube_code1(plan.getPaper_tube_material());
+                    empty.setTube_code2(plan.getPaper_tube_material());
-                    empty.setTube_name1(plan.getPaper_tube_model());
+                    empty.setTube_name2(plan.getPaper_tube_model());
                 } else {
-                    empty.setTube_code1(plan.getFRP_material());
+                    empty.setTube_code2(plan.getFRP_material());
-                    empty.setTube_name1(plan.getFRP_model());
+                    empty.setTube_name2(plan.getFRP_model());
                 }
                 empty.setContainer_name2(plan.getContainer_name());
             }

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java

@@ -644,6 +644,20 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
             throw new BadRequestException("有未生成状态的分配明细，不允许强制确认!");
         }
 
+        // 判断是否有未完成的任务
+        String task_in = disDaoList.stream()
+                .map(row -> row.getTask_id().toString())
+                .distinct()
+                .collect(Collectors.joining("','"));
+
+        JSONArray taskArr = taskService.query("task_id IN ('" + task_in + "') AND task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "' AND is_delete = '0'")
+                .getResultJSONArray(0);
+
+        if (ObjectUtil.isNotEmpty(taskArr)) {
+            throw new BadRequestException("有任务未完成，不允许强制确认!");
+        }
+        
+
         // 需要更新的库存集合
         List<JSONObject> needUpdateIvtList = new ArrayList<>();
 
@@ -659,6 +673,11 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
             jsonIvt.put("material_id", disDao.getMaterial_id());
             jsonIvt.put("pcsn", disDao.getPcsn());
             jsonIvt.put("canuse_qty", disDao.getPlan_qty());
+
+            // 判断木箱是否是主存区的，如果是主存区的则不更新库存
+            if (disDao.getSect_id().toString().equals(RegionTypeEnum.TWO_BZC01.getId())) {
+                continue;
+            }
             needUpdateIvtList.add(jsonIvt);
 
             if (disDao.getTask_id() != null) {
@@ -670,10 +689,13 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
         UpdateExceptional(disDaoList);
 
         // 更新库存
-        outBussManageService.upateIvt(needUpdateIvtList,mstDao,IOSEnum.IVT_CHANGE.code("减库存"));
+        if (ObjectUtil.isNotEmpty(needUpdateIvtList)) {
+            outBussManageService.upateIvt(needUpdateIvtList,mstDao,IOSEnum.IVT_CHANGE.code("减库存"));
+        }
 
-        // 更新仓位
+        // 更新仓位: 主存区仓位不更新
         List<String> paramLockList = disDaoList.stream()
+                .filter(row -> !row.getSect_id().toString().equals(RegionTypeEnum.TWO_BZC01.getId()))
                 .map(StIvtIostorinvdis::getStruct_code)
                 .distinct()
                 .collect(Collectors.toList());
@@ -686,7 +708,9 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
         jsonLockParam.put("lock_type", IOSEnum.LOCK_TYPE.code("未锁定"));
         jsonLockParam.put("operate", IOSEnum.IO_TYPE.code("出库"));
 
-        outBussManageService.lockStruct(paramLockList,jsonLockParam);
+        if (ObjectUtil.isNotEmpty(paramLockList)) {
+            outBussManageService.lockStruct(paramLockList,jsonLockParam);
+        }
 
         // 更新单据
         mstDao.setBill_status(IOSEnum.BILL_STATUS.code("完成"));
@@ -834,6 +858,36 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
             throw new BadRequestException("未查询到对应的出库单据！");
         }
 
+        // 更新库存
+        // 需要更新的仓位库存
+        List<JSONObject> needUpdateIvtList = new ArrayList<>();
+        for (int i = 0; i < disDaoList.size(); i++) {
+            StIvtIostorinvdis dao = disDaoList.get(i);
+
+            JSONObject jsonIvt = new JSONObject();
+            jsonIvt.put("struct_id", dao.getStruct_id());
+            jsonIvt.put("material_id", dao.getMaterial_id());
+            jsonIvt.put("pcsn", dao.getPcsn());
+            jsonIvt.put("canuse_qty", dao.getPlan_qty());
+
+            needUpdateIvtList.add(jsonIvt);
+        }
+        outBussManageService.upateIvt(needUpdateIvtList,mstDao,IOSEnum.IVT_CHANGE.code("减库存"));
+
+        // 更新仓位
+        List<String> paramLockList = new ArrayList<>();
+
+        JSONObject jsonLockParam = new JSONObject();
+        jsonLockParam.put("inv_type", "");
+        jsonLockParam.put("inv_id", "");
+        jsonLockParam.put("inv_code", "");
+        jsonLockParam.put("storagevehicle_code", "");
+        jsonLockParam.put("lock_type", IOSEnum.LOCK_TYPE.code("未锁定"));
+        jsonLockParam.put("operate", IOSEnum.IO_TYPE.code("出库"));
+
+        paramLockList.add(disDao.getStruct_code());
+        outBussManageService.lockStruct(paramLockList,jsonLockParam);
+
         if (IOSEnum.OUT_TYPE.code("改切出库").equals(mstDao.getBill_type()) || IOSEnum.OUT_TYPE.code("返检出库").equals(mstDao.getBill_type())) {
             HashMap<String, String> map = new HashMap<>();
             map.put("need_delete", IOSEnum.IS_NOTANDYES.code("是"));

lms/nladmin-system/src/main/resources/config/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8010
+  port: 9999
 #配置数据源
 spring:
   datasource:
@@ -7,10 +7,9 @@ spring:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.91}:${DB_PORT:3306}/${DB_NAME:lms_test2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_two_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-        #      username: ${DB_USER:root}
       username: ${DB_USER:root}
-      password: ${DB_PWD:root}
+      password: ${DB_PWD:12356}
       # 初始连接数
       initial-size: 5
       # 最小连接数
@@ -161,9 +160,6 @@ sa-token:
   jwt-secret-key: opsjajisdnnca0sdkksdfaaasdfwwq
   # token 前缀
   token-prefix: Bearer
-  cookie:
-    # 配置 Cookie 作用域:根据二级域名实现sso登入如lms.sso.com;acs.sso.com
-    domain:
 
 loki:
   url: http://localhost:3100/loki/api/v1

lms/nladmin-ui/.env.development

@@ -1,8 +1,8 @@
 ENV = 'development'
 
 # 接口地址
-VUE_APP_BASE_API  = 'http://localhost:8011'
+VUE_APP_BASE_API  = 'http://localhost:9999'
-VUE_APP_WS_API = 'ws://localhost:8011'
+VUE_APP_WS_API = 'ws://localhost:9999'
 
 # 是否启用 babel-plugin-dynamic-import-node插件
 VUE_CLI_BABEL_TRANSPILE_MODULES = true