From 971e1c99ae97c53a2b6a9f18cd814522480a3dd0 Mon Sep 17 00:00:00 2001
From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com>
Date: Mon, 28 Jul 2025 13:18:38 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StructattrServiceImpl.java         |  2 +-
 .../service/impl/RawAssistIStorServiceImpl.java     | 13 +++++++++++--
 nladmin-ui/src/views/wms/st/inbill/AddDialog.vue    |  3 +--
 nladmin-ui/src/views/wms/st/inbill/AddDtl.vue       | 10 ----------
 nladmin-ui/src/views/wms/st/inbill/DivDialog.vue    |  4 +---
 nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue   |  4 ----
 nladmin-ui/src/views/wms/st/outbill/DivDialog.vue   |  2 --
 nladmin-ui/src/views/wms/st/outbill/StructIvt.vue   | 13 -------------
 nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue  |  2 --
 9 files changed, 14 insertions(+), 39 deletions(-)

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java
index 5954866..760f03f 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java
@@ -344,7 +344,7 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
         List<String> strategy = one.getStrategy();
         Map<String, Decisioner> decisionerMap = SpringContextHolder.getBeansOfType(Decisioner.class);
         QueryWrapper<Structattr> query = new QueryWrapper<Structattr>()
-                .eq("is_used", true)
+                .eq("is_used", "1")
                 .eq("lock_type",IOSEnum.LOCK_TYPE.code("未锁定"))
                 .eq("sect_code", param.getSect_code())
                 .isNull("storagevehicle_code");
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java
index 0a82962..ca687eb 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java
@@ -20,9 +20,11 @@ import org.nl.common.utils.SecurityUtils;
 import org.nl.config.SpringContextHolder;
 import org.nl.wms.basedata_manage.enums.BaseDataEnum;
 import org.nl.wms.basedata_manage.service.IBsrealStorattrService;
+import org.nl.wms.basedata_manage.service.ISectattrService;
 import org.nl.wms.basedata_manage.service.IStructattrService;
 import org.nl.wms.basedata_manage.service.dao.BsrealStorattr;
 import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo;
+import org.nl.wms.basedata_manage.service.dao.Sectattr;
 import org.nl.wms.basedata_manage.service.dao.Structattr;
 import org.nl.wms.basedata_manage.service.dao.mapper.MdPbStoragevehicleinfoMapper;
 import org.nl.wms.basedata_manage.service.dto.StrategyStructParam;
@@ -66,6 +68,9 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
     @Resource
     private IBsrealStorattrService iBsrealStorattrService;
 
+    @Resource
+    private ISectattrService iSectattrService;
+
     @Resource
     private IStructattrService iStructattrService;
 
@@ -132,6 +137,7 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public String insertDtl(Map whereJson) {
         ArrayList<HashMap> rows = (ArrayList<HashMap>) whereJson.get("tableData");
         String currentUserId = SecurityUtils.getCurrentUserId();
@@ -217,6 +223,7 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void deleteAll(String[] ids) {
         String currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getCurrentNickName();
@@ -344,6 +351,8 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
         String struct_name = "";
         //是否自动分配仓位
         Boolean checked = mst.getBoolean("checked");
+        BsrealStorattr stor = iBsrealStorattrService.findById(param.getString("stor_code"));
+        Sectattr sect = iSectattrService.findById(param.getString("sect_code"));
         if (ObjectUtil.isNotEmpty(checked) && checked) {
             param.put("qty", map.get("plan_qty"));
             param.put("material_code", map.get("material_code"));
@@ -352,8 +361,8 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
             List<Structattr> structattrs = iStructattrService.inBoundSectDiv(
                     StrategyStructParam.builder()
                             .ioType(param.getString("ioType"))
-                            .sect_code(param.getString("sect_code"))
-                            .stor_code(param.getString("stor_code"))
+                            .sect_code(sect.getSect_code())
+                            .stor_code(stor.getStor_code())
                             .material_code(param.getString("material_code"))
                             .qty(new BigDecimal(param.getString("qty")))
                             .pcsn(param.getString("pcsn"))
diff --git a/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue b/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue
index 7deac2b..ce91154 100644
--- a/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue
+++ b/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue
@@ -131,8 +131,7 @@
       :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
     >
       <el-table-column type="index" label="序号" width="55" align="center" />
-      <el-table-column show-overflow-tooltip width="150" prop="storagevehicle_code" label="批次号" />
-      <el-table-column show-overflow-tooltip width="150" prop="pcsn" label="批次号" />
+      <el-table-column show-overflow-tooltip width="150" prop="storagevehicle_code" label="载具号" />
       <el-table-column show-overflow-tooltip width="150" prop="material_code" label="物料编码" />
       <el-table-column show-overflow-tooltip width="150" prop="material_name" label="物料名称" />
       <el-table-column show-overflow-tooltip width="170" prop="qty" label="数量" />
diff --git a/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue b/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue
index bfe996e..1c109a8 100644
--- a/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue
+++ b/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue
@@ -21,15 +21,6 @@
           class="filter-item"
           @keyup.enter.native="crud.toQuery"
         />
-        <el-input
-          v-model="query.pcsn"
-          clearable
-          size="mini"
-          placeholder="批次号"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
         <el-input
           v-model="query.material_code"
           clearable
@@ -55,7 +46,6 @@
         <el-table-column show-overflow-tooltip width="150" prop="storagevehicle_code" label="载具编码" />
         <el-table-column show-overflow-tooltip width="150" prop="material_code" label="物料编码" />
         <el-table-column show-overflow-tooltip width="150" prop="material_name" label="物料名称" />
-        <el-table-column width="200" prop="pcsn" label="批次号" />
         <el-table-column show-overflow-tooltip width="170" prop="qty" label="数量" />
         <el-table-column show-overflow-tooltip width="170" prop="qty_unit_name" label="计量单位名称" />
         <el-table-column prop="ext_code" label="来源单号" :min-width="flexWidth('ext_code',crud.data,'来源单号')" />
diff --git a/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue b/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue
index 545664e..5bb179e 100644
--- a/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue
+++ b/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue
@@ -64,7 +64,6 @@
         </el-table-column>
         <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-        <el-table-column show-overflow-tooltip prop="pcsn" label="批次号" align="center" />
         <el-table-column
           show-overflow-tooltip
           prop="plan_qty"
@@ -161,7 +160,6 @@
         <el-table-column show-overflow-tooltip type="index" label="序号" align="center" />
         <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-        <el-table-column show-overflow-tooltip prop="pcsn" label="批次号" align="center" />
         <el-table-column
           show-overflow-tooltip
           prop="plan_qty"
@@ -259,7 +257,7 @@ export default {
         this.sects = res.content
       })
 
-      const area_type = 'RKQ'
+      const area_type = 'SSX'
 
       crudPoint.getPointList({ 'region_code': area_type }).then(res => {
         this.pointlist = res
diff --git a/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue b/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue
index 7634cde..9aac28f 100644
--- a/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue
+++ b/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue
@@ -109,8 +109,6 @@
         <el-table-column :formatter="bill_statusFormat" prop="bill_status" label="状态" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-        <el-table-column prop="pcsn" label="批次号" width="150" align="center" />
-        <!--        <el-table-column prop="sap_pcsn" label="SAP批次号" width="150" align="center" />-->
         <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
         <el-table-column prop="qty_unit_name" label="单位" align="center" />
         <el-table-column prop="source_bill_type" label="源单类型" align="center" width="130px" />
@@ -136,8 +134,6 @@
       >
         <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-        <el-table-column prop="pcsn" label="批次号" align="center" width="150" />
-        <!--        <el-table-column prop="sap_pcsn" label="SAP批次号" align="center" />-->
         <el-table-column prop="storagevehicle_code" label="载具号" align="center" />
         <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
         <el-table-column prop="point_code" label="起始位置" align="center" />
diff --git a/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue b/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
index bcc56c6..731ae23 100644
--- a/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
+++ b/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
@@ -127,7 +127,6 @@
         <el-table-column prop="bill_status" label="状态" align="center" width="110px" :formatter="bill_statusFormat" />
         <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-        <el-table-column show-overflow-tooltip prop="pcsn" label="批次号" align="center" width="140px" />
         <el-table-column show-overflow-tooltip prop="plan_qty" label="重量" :formatter="crud.formatNum3" align="center" />
         <el-table-column show-overflow-tooltip prop="assign_qty" label="已分配重量" :formatter="crud.formatNum3" align="center" />
         <el-table-column show-overflow-tooltip prop="unassign_qty" label="未分配重量" :formatter="crud.formatNum3" align="center" />
@@ -210,7 +209,6 @@
         <el-table-column prop="material_code" label="物料编码" width="150px" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
         <el-table-column prop="material_name" label="物料名称" width="170px" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
         <el-table-column prop="storagevehicle_code" label="载具号" width="150px" :min-width="flexWidth('storagevehicle_code',crud.data,'载具号')" />
-        <el-table-column prop="pcsn" label="批次号" width="150px" :min-width="flexWidth('pcsn',crud.data,'批次号')" />
         <el-table-column show-overflow-tooltip prop="plan_qty" label="出库重量" :formatter="crud.formatNum3" align="center" width="120px" :min-width="flexWidth('plan_qty',crud.data,'出库重量')">
           <template scope="scope">
             <el-input-number v-show="mstrow.bill_type === '1011'" v-model="scope.row.plan_qty" :precision="3" :controls="false" :min="1" style="width: 90px" />
diff --git a/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue b/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue
index abd5ab0..6250783 100644
--- a/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue
+++ b/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue
@@ -61,18 +61,6 @@
               class="filter-item"
             />
           </el-form-item>
-          <el-form-item label="批次号" prop="pcsn">
-            <el-input
-              v-model="queryrow.pcsn"
-              clearable
-              style="width: 220px"
-              size="mini"
-              :disabled="pscnDisabled"
-              placeholder="批次号"
-              prefix-icon="el-icon-search"
-              class="filter-item"
-            />
-          </el-form-item>
           <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="queryStruct">搜索</el-button>
         </el-form>
       </div>
@@ -92,7 +80,6 @@
       <el-table-column show-overflow-tooltip prop="struct_code" label="仓位" align="center" />
       <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="托盘编码" align="center" width="250px" />
       <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-      <el-table-column show-overflow-tooltip sortable prop="pcsn" label="批次号" align="center" width="150px" />
       <el-table-column show-overflow-tooltip prop="canuse_qty" label="可出重量" :formatter="crud.formatNum3" align="center" />
       <el-table-column align="center" label="操作" width="160" fixed="right">
         <template scope="scope">
diff --git a/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue b/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
index 2e9055d..b630343 100644
--- a/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
+++ b/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
@@ -128,7 +128,6 @@
         <el-table-column :formatter="bill_statusFormat" prop="bill_status" label="状态" />
         <el-table-column min-width="140" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-        <el-table-column prop="pcsn" label="批次号" width="150px" align="center" show-overflow-tooltip />
         <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
         <el-table-column prop="assign_qty" :formatter="crud.formatNum3" label="已分配重量" align="center" width="100px" />
         <el-table-column prop="unassign_qty" :formatter="crud.formatNum3" label="未分配重量" align="center" width="100px" />
@@ -156,7 +155,6 @@
         <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
         <el-table-column prop="storagevehicle_code" label="载具号" width="150px" :min-width="flexWidth('storagevehicle_code',crud.data,'载具号')" />
-        <el-table-column prop="pcsn" label="批次号" align="center" show-overflow-tooltip />
         <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
         <el-table-column prop="struct_code" label="仓位" align="center" show-overflow-tooltip />
         <el-table-column prop="sect_name" label="区域" align="center" show-overflow-tooltip />