From 0b67dd45201cb9a92578375b087239b6e637d7a6 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Sat, 4 Jul 2026 17:16:51 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E5=8D=95=E4=BD=8D=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MdMeMaterialbaseServiceImpl.java     | 17 +++++++--
 .../service/core/tasks/Point2PointTask.java   | 36 -------------------
 .../src/views/wms/basedata/material/index.vue | 26 ++++++++++++--
 3 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java
index 4dffff5..0b83c6c 100644
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java
@@ -9,12 +9,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.basedata_manage.service.IMdMeMaterialbaseService;
+import org.nl.wms.basedata_manage.service.IMdPbMeasureunitService;
 import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase;
+import org.nl.wms.basedata_manage.service.dao.MdPbMeasureunit;
 import org.nl.wms.basedata_manage.service.dao.mapper.MdMeMaterialbaseMapper;
 import org.nl.wms.ext_manage.service.WmsToErpService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +47,12 @@ public class MdMeMaterialbaseServiceImpl extends ServiceImpl<MdMeMaterialbaseMap
     @Autowired
     private WmsToErpService wmsToErpService;
 
+    /**
+     * wms调用erp服务
+     */
+    @Autowired
+    private IMdPbMeasureunitService iMdPbMeasureunitService;
+
     @Override
     public IPage<MdMeMaterialbase> queryAll(Map whereJson, PageQuery page) {
         // 查询条件
@@ -62,7 +71,6 @@ public class MdMeMaterialbaseServiceImpl extends ServiceImpl<MdMeMaterialbaseMap
     }
 
     @Override
-    @Transactional
     public void create(MdMeMaterialbase dto) {
         // 根据物料编码查询是否有相同物料编码的物料
         MdMeMaterialbase mdMeMaterialbase = this.baseMapper.selectOne(
@@ -72,7 +80,10 @@ public class MdMeMaterialbaseServiceImpl extends ServiceImpl<MdMeMaterialbaseMap
         if (ObjectUtil.isNotEmpty(mdMeMaterialbase)) {
             throw new BadRequestException("当前物料编码已存在【"+dto.getMaterial_code()+"】");
         }
-
+        if (StringUtils.isEmpty(dto.getQty_unit_id())){
+            throw new BadRequestException("创建物料失败,物料单位不能为空");
+        }
+        final MdPbMeasureunit measureunit = iMdPbMeasureunitService.getById(dto.getQty_unit_id());
         // 新增
         dto.setMaterial_id(IdUtil.getStringId());
         dto.setCreate_id(SecurityUtils.getCurrentUserId());
@@ -81,6 +92,8 @@ public class MdMeMaterialbaseServiceImpl extends ServiceImpl<MdMeMaterialbaseMap
         dto.setUpdate_optid(SecurityUtils.getCurrentUserId());
         dto.setUpdate_optname(SecurityUtils.getCurrentNickName());
         dto.setUpdate_time(DateUtil.now());
+        dto.setQty_unit_id(measureunit.getMeasure_unit_id());
+        dto.setQty_unit_name(measureunit.getUnit_name());
         this.save(dto);
     }
 
diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/Point2PointTask.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/Point2PointTask.java
index 750db4d..ae1e272 100644
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/Point2PointTask.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/Point2PointTask.java
@@ -140,13 +140,6 @@ public class Point2PointTask extends AbstractTask {
                         .set(SchBasePoint::getIos_id, null)
                         .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("无货"))
         );
-        iStructattrService.update(
-                new UpdateWrapper<Structattr>().lambda()
-                        .eq(Structattr::getStruct_code, taskObj.getPoint_code1())
-                        .set(Structattr::getStoragevehicle_code, null)
-                        .set(Structattr::getTask_code, null)
-                        .set(Structattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
-        );
         // 更新终点
         iSchBasePointService.update(
                 new UpdateWrapper<SchBasePoint>().lambda()
@@ -155,13 +148,6 @@ public class Point2PointTask extends AbstractTask {
                         .set(SchBasePoint::getIos_id, null)
                         .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("有货"))
         );
-        iStructattrService.update(
-                new UpdateWrapper<Structattr>().lambda()
-                        .eq(Structattr::getStruct_code, taskObj.getPoint_code2())
-                        .set(Structattr::getStoragevehicle_code, taskObj.getVehicle_code())
-                        .set(Structattr::getTask_code, null)
-                        .set(Structattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
-        );
         // 更新任务
         taskObj.setRemark("已完成");
         taskObj.setTask_status(TaskStatus.FINISHED.getCode());
@@ -170,28 +156,6 @@ public class Point2PointTask extends AbstractTask {
 
     @Transactional
     public void cancelTask(SchBaseTask taskObj) {
-        // 更新起点
-        iSchBasePointService.update(
-                new UpdateWrapper<SchBasePoint>().lambda()
-                        .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1())
-                        .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("无货"))
-        );
-        iStructattrService.update(
-                new UpdateWrapper<Structattr>().lambda()
-                        .eq(Structattr::getStruct_code, taskObj.getPoint_code1())
-                        .set(Structattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
-        );
-        // 更新终点
-        iSchBasePointService.update(
-                new UpdateWrapper<SchBasePoint>().lambda()
-                        .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code2())
-                        .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("无货"))
-        );
-        iStructattrService.update(
-                new UpdateWrapper<Structattr>().lambda()
-                        .eq(Structattr::getStruct_code, taskObj.getPoint_code2())
-                        .set(Structattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
-        );
         // 更新任务
         taskObj.setRemark("已取消");
         taskObj.setTask_status(TaskStatus.CANCELED.getCode());
diff --git a/nladmin-ui/src/views/wms/basedata/material/index.vue b/nladmin-ui/src/views/wms/basedata/material/index.vue
index fb619a2..807711c 100644
--- a/nladmin-ui/src/views/wms/basedata/material/index.vue
+++ b/nladmin-ui/src/views/wms/basedata/material/index.vue
@@ -74,6 +74,22 @@
             </el-col>
           </el-row>
           <el-row>
+            <el-col :span="8">
+              <el-form-item label="单    位" prop="qty_unit_id">
+                <el-select
+                  v-model="form.qty_unit_id"
+                  style="width: 200px"
+                  placeholder=""
+                >
+                  <el-option
+                    v-for="item in tableEnum.md_pb_measureunit"
+                    :key="item.id"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="静置时间" prop="standing_time">
                 <el-input-number v-model="form.standing_time" :controls="false" :min="0" label="分钟" style="width: 200px;" />
@@ -104,7 +120,9 @@
         <el-table-column prop="material_code" label="物料编码" width="160" />
         <el-table-column prop="material_name" label="物料名称" width="160" show-overflow-tooltip />
         <el-table-column prop="material_spec" label="物料规格" width="160" show-overflow-tooltip />
-        <el-table-column prop="material_model" label="物料型号" width="680" show-overflow-tooltip />
+        <el-table-column prop="material_model" label="物料型号" width="160" show-overflow-tooltip />
+        <el-table-column prop="qty_unit_name" label="单位" width="160" show-overflow-tooltip />
+        <el-table-column prop="ext_id" label="外部标识" width="160" show-overflow-tooltip />
         <el-table-column prop="class_name" label="物料分类" width="140" />
         <el-table-column label="启用" align="center" prop="is_used">
           <template slot-scope="scope">
@@ -163,7 +181,7 @@ const defaultForm = {
   approve_fileno: null,
   print_no: null,
   material_type_id: null,
-  len_unit_id: null,
+  qty_unit_id: null,
   length: null,
   width: null,
   height: null,
@@ -189,6 +207,7 @@ export default {
   name: 'Materia',
   // 数据字典
   dicts: ['is_used'],
+  tableEnums: ['md_pb_measureunit#unit_name#measure_unit_id'],
   components: { UploadDialog, pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
@@ -221,6 +240,9 @@ export default {
         material_name: [
           { required: true, message: '物料名称不能为空', trigger: 'blur' }
         ],
+        qty_unit_id: [
+          { required: true, message: '单位不能为空', trigger: 'blur' }
+        ],
         create_id: [
           { required: true, message: '不能为空', trigger: 'blur' }
         ],