From ad2f8e2e5825dec4c1ba597d9bb0d7fec113ce61 Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Wed, 11 Sep 2024 15:40:56 +0800
Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=89=8B?=
 =?UTF-8?q?=E6=8C=81=20=E7=BC=93=E5=AD=98=E7=A0=81=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=9B=20rev=EF=BC=9A=E7=82=B9=E4=BD=8D?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=90=E6=89=98=E7=9B=98=E5=8F=B7=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0=E7=BB=84=E7=9B=98?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=8B=BE=E9=80=89=E6=A1=86=EF=BC=9B=E6=89=8B?=
 =?UTF-8?q?=E6=8C=81=E6=89=80=E6=9C=89=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0code=E5=AD=97=E6=AE=B5=EF=BC=8C1=E4=B8=BA?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=88=90=E5=8A=9F0=E4=B8=BA=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/pda/controller/PdaController.java  |   7 ++
 .../org/nl/wms/pda/service/PdaService.java    |   2 +
 .../wms/pda/service/dao/vo/PdaResponseVo.java |  20 +++
 .../wms/pda/service/impl/PdaServiceImpl.java  | 117 +++++++++++++++++-
 .../controller/SchBasePointController.java    |   2 +-
 .../point/service/ISchBasePointService.java   |   6 +
 .../service/impl/SchBasePointServiceImpl.java |  59 +++++++--
 .../sch/task_manage/task/tasks/YCLCKTask.java |  11 +-
 .../src/views/wms/sch/point/index.vue         |  63 +++-------
 9 files changed, 211 insertions(+), 76 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java
index 79d639c..4339e89 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java
@@ -110,6 +110,13 @@ public class PdaController {
         return new ResponseEntity<>(pdaService.zpjb(param), HttpStatus.OK);
     }
 
+    @PostMapping("/zpchange")
+    @Log("缓存码变更")
+    @ApiOperation("缓存码变更")
+    public ResponseEntity<Object> zpchange(@RequestBody JSONObject param){
+        return new ResponseEntity<>(pdaService.zpchange(param), HttpStatus.OK);
+    }
+
     @PostMapping("/ycck")
     @Log("废包材异常出库")
     @ApiOperation("废包材异常出库")
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java
index 1a1943d..a260646 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java
@@ -19,6 +19,8 @@ public interface PdaService {
 
     PdaResponseVo zpjb(JSONObject param);
 
+    PdaResponseVo zpchange(JSONObject param);
+
     PdaResponseVo ycck();
 
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/PdaResponseVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/PdaResponseVo.java
index c2757e9..989cd7e 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/PdaResponseVo.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/PdaResponseVo.java
@@ -11,10 +11,30 @@ import lombok.Data;
 public class PdaResponseVo {
     // 先提供一个message
     private String message;
+    // 先提供一个message
+    private String code;
 
+    /**
+     * 返回成功
+     * @param message
+     * @return
+     */
     public static PdaResponseVo pdaResultOk(String message) {
         PdaResponseVo vo = new PdaResponseVo();
         vo.setMessage(message);
+        vo.setCode("1");
+        return vo;
+    }
+
+    /**
+     * 返回失败
+     * @param message
+     * @return
+     */
+    public static PdaResponseVo pdaResultError(String message) {
+        PdaResponseVo vo = new PdaResponseVo();
+        vo.setMessage(message);
+        vo.setCode("0");
         return vo;
     }
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
index b5debdb..dd6c6e5 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
@@ -4,8 +4,10 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.ext.service.AcsToWmsService;
 import org.nl.wms.ext.service.dto.to.BaseResponse;
 import org.nl.wms.pda.service.PdaService;
@@ -13,6 +15,7 @@ import org.nl.wms.pda.service.dao.mapper.PdaMapper;
 import org.nl.wms.pda.service.dao.vo.PdaResponseVo;
 import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
 import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
+import org.nl.wms.sch.group.service.dao.mapper.SchBaseVehiclematerialgroupMapper;
 import org.nl.wms.sch.material.service.dao.Material;
 import org.nl.wms.sch.material.service.dao.mapper.MaterialMapper;
 import org.nl.wms.sch.point.service.ISchBasePointService;
@@ -22,6 +25,7 @@ import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
 import org.nl.wms.sch.task_manage.task.tasks.mapper.PointMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import java.util.List;
 
@@ -46,6 +50,8 @@ public class PdaServiceImpl implements PdaService {
     private PointMapper pointMapper;
     @Autowired
     private MaterialMapper materialMapper;
+    @Autowired
+    private SchBaseVehiclematerialgroupMapper vehiclematerialgroupMapper;
     @Override
     public PdaResponseVo dwzt(JSONObject param) {
         return PdaResponseVo.pdaResultOk("回温状态查询成功");
@@ -53,34 +59,73 @@ public class PdaServiceImpl implements PdaService {
 
     @Override
     public PdaResponseVo yclrk(JSONObject param) {
+        PdaResponseVo result = new PdaResponseVo();
         param.put("request_medthod_code", "YCLRKTask");
         param.put("request_medthod_name", "原材料入库");
         param.put("device_code",param.getString("start_point"));
         BaseResponse baseResponse=acsToWmsService.pdaApply(param);
-        return PdaResponseVo.pdaResultOk(baseResponse.getMessage());
+        Integer code = baseResponse.getCode();
+        if(code == HttpStatus.OK.value()){
+            result = PdaResponseVo.pdaResultOk(baseResponse.getMessage());
+        }else {
+            result = PdaResponseVo.pdaResultError(baseResponse.getMessage());
+        }
+        return result;
     }
     @Override
     public PdaResponseVo yclck(JSONObject param) {
+        PdaResponseVo result = new PdaResponseVo();
+        String workorder_code = param.getString("workorder_code");
+        workorder_code = workorder_code.trim();
+        if(ObjectUtil.isEmpty(workorder_code)){
+            result = PdaResponseVo.pdaResultError("工单号不能为空!");
+            return result;
+        }
         param.put("request_medthod_code", "YCLCKTask");
         param.put("request_medthod_name", "原材料出库");
         param.put("device_code",param.getString("start_point"));
         BaseResponse baseResponse=acsToWmsService.pdaApply(param);
-        return PdaResponseVo.pdaResultOk(baseResponse.getMessage());
+        Integer code = baseResponse.getCode();
+        if(code == HttpStatus.OK.value()){
+            result = PdaResponseVo.pdaResultOk(baseResponse.getMessage());
+        }else {
+            result = PdaResponseVo.pdaResultError(baseResponse.getMessage());
+        }
+        return result;
     }
 
     @Override
     public PdaResponseVo task(JSONObject param) {
+        PdaResponseVo result = new PdaResponseVo();
         param.put("request_medthod_code", "POINTTask");
         param.put("request_medthod_name", "点对点任务");
         param.put("device_code",param.getString("start_point"));
         BaseResponse baseResponse=acsToWmsService.pdaApply(param);
-        return PdaResponseVo.pdaResultOk(baseResponse.getMessage());
+        Integer code = baseResponse.getCode();
+        if(code == HttpStatus.OK.value()){
+            result = PdaResponseVo.pdaResultOk(baseResponse.getMessage());
+        }else {
+            result = PdaResponseVo.pdaResultError(baseResponse.getMessage());
+        }
+        return result;
     }
 
 
     @Override
     public PdaResponseVo zpjb(JSONObject param) {
+        PdaResponseVo result = new PdaResponseVo();
         String subTray = param.getString("sub_tray");
+        subTray = subTray.trim();
+        if(ObjectUtil.isEmpty(subTray)){
+            result = PdaResponseVo.pdaResultError("子托盘号不能为空!");
+            return result;
+        }
+        String motherTray = param.getString("mother_tray");
+        motherTray = motherTray.trim();
+        if(ObjectUtil.isEmpty(motherTray)){
+            result = PdaResponseVo.pdaResultError("母托盘号不能为空!");
+            return result;
+        }
         //子拖盘解绑
         if(ObjectUtil.isNotEmpty(subTray)){
             //查询母托盘
@@ -102,7 +147,6 @@ public class PdaServiceImpl implements PdaService {
                 pointService.update(schBasePoint);
             }
         }
-        String motherTray = param.getString("mother_tray");
         //母盘解绑
         if(ObjectUtil.isNotEmpty(motherTray)){
             //查询母托盘
@@ -130,8 +174,65 @@ public class PdaServiceImpl implements PdaService {
         return PdaResponseVo.pdaResultOk("组盘解绑成功");
     }
 
+    @Override
+    public PdaResponseVo zpchange(JSONObject param) {
+        PdaResponseVo result = new PdaResponseVo();
+        String currentUserId = SecurityUtils.getCurrentUserId();
+        String nickName = SecurityUtils.getCurrentNickName();
+        String now = DateUtil.now();
+        //原托盘号
+        String sub_tray = param.getString("sub_tray");
+        sub_tray = sub_tray.trim();
+        //新托盘号
+        String new_sub_tray = param.getString("new_sub_tray");
+        new_sub_tray = new_sub_tray.trim();
+        if(ObjectUtil.isEmpty(new_sub_tray)){
+            result = PdaResponseVo.pdaResultError("新子托盘号不能为空!");
+        }else{
+
+            List<Material> materialList = materialMapper.selectList(new LambdaQueryWrapper<Material>()
+                    .eq(Material::getPalletSN,new_sub_tray)
+                    .le(Material::getReturn_status, "1")
+                    .eq(Material::getGroup_bind_material_status, GroupBindMaterialStatusEnum.BOUND.getValue()));
+            if (ObjectUtil.isEmpty(materialList)) {
+                result = PdaResponseVo.pdaResultError("新子托盘号无组盘入库单据信息!");
+            }else{
+                if(ObjectUtil.isEmpty(sub_tray)){
+                    result = PdaResponseVo.pdaResultError("原子托盘号不能为空!");
+                }else if (!sub_tray.startsWith("YBHC")){
+                    result = PdaResponseVo.pdaResultError("原子托盘号非缓存临时码!");
+                }else{
+                    //更新点位载具
+                    LambdaUpdateWrapper<SchBasePoint> updateWrapper = new LambdaUpdateWrapper<>();
+                    updateWrapper.eq(SchBasePoint::getVehicle_code2,sub_tray);
+
+                    updateWrapper.set(SchBasePoint::getVehicle_code2,new_sub_tray);
+                    updateWrapper.set(SchBasePoint::getUpdate_id,currentUserId);
+                    updateWrapper.set(SchBasePoint::getUpdate_name,nickName);
+                    updateWrapper.set(SchBasePoint::getUpdate_time,now);
+                    pointMapper.update(null,updateWrapper);
+
+                    //更新组盘载具
+                    LambdaUpdateWrapper<SchBaseVehiclematerialgroup> updateWrapper_group = new LambdaUpdateWrapper<>();
+                    updateWrapper_group.eq(SchBaseVehiclematerialgroup::getVehicle_code,sub_tray);
+                    updateWrapper_group.le(SchBaseVehiclematerialgroup::getGroup_bind_material_status,"2");
+
+                    updateWrapper_group.set(SchBaseVehiclematerialgroup::getVehicle_code,new_sub_tray);
+                    updateWrapper_group.set(SchBaseVehiclematerialgroup::getSource_vehicle_code,sub_tray);
+                    updateWrapper_group.set(SchBaseVehiclematerialgroup::getUpdate_id,currentUserId);
+                    updateWrapper_group.set(SchBaseVehiclematerialgroup::getUpdate_name,nickName);
+                    updateWrapper_group.set(SchBaseVehiclematerialgroup::getUpdate_time,now);
+                    vehiclematerialgroupMapper.update(null,updateWrapper_group);
+                    result = PdaResponseVo.pdaResultOk("缓存码变更成功!");
+                }
+            }
+        }
+        return result;
+    }
+
     @Override
     public PdaResponseVo ycck() {
+        PdaResponseVo result = new PdaResponseVo();
         JSONObject param=new JSONObject();
         SchBasePoint schBasePoint= pointService.getOne(new LambdaQueryWrapper<SchBasePoint>()
                 .eq(SchBasePoint::getPoint_code, "FBC01"));
@@ -144,6 +245,12 @@ public class PdaServiceImpl implements PdaService {
         param.put("start_point","FBC01");
         param.put("next_point","DKT01");
         BaseResponse baseResponse=acsToWmsService.pdaApply(param);
-        return PdaResponseVo.pdaResultOk(baseResponse.getMessage());
+        Integer code = baseResponse.getCode();
+        if(code == HttpStatus.OK.value()){
+            result = PdaResponseVo.pdaResultOk(baseResponse.getMessage());
+        }else {
+            result = PdaResponseVo.pdaResultError(baseResponse.getMessage());
+        }
+        return result;
     }
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java
index 5e80e39..03eadcd 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java
@@ -78,7 +78,7 @@ public class SchBasePointController {
     @ApiOperation("修改点位管理")
     //@SaCheckPermission("@el.check('schBasePoint:edit')")
     public ResponseEntity<Object> update(@Validated @RequestBody SchBasePoint entity){
-        schBasePointService.update(entity);
+        schBasePointService.updateByPc(entity);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java
index e738620..f0a132d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java
@@ -37,6 +37,12 @@ public interface ISchBasePointService extends IService<SchBasePoint> {
     */
     void update(SchBasePoint entity);
 
+    /**
+     * pc端编辑
+     * @param entity /
+     */
+    void updateByPc(SchBasePoint entity);
+
     /**
     * 多选删除
     * @param ids /
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
index 72aaf1e..39a710a 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
@@ -14,12 +14,15 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.SecurityUtils;
+import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
+import org.nl.wms.sch.group.service.dao.mapper.SchBaseVehiclematerialgroupMapper;
 import org.nl.wms.sch.point.service.ISchBasePointService;
 import org.nl.wms.sch.point.service.dao.SchBasePoint;
 import org.nl.wms.sch.point.service.dao.mapper.SchBasePointMapper;
 import org.nl.wms.sch.region.service.dao.SchBaseRegion;
 import org.nl.wms.sch.region.service.dao.mapper.SchBaseRegionMapper;
 import org.nl.wms.sch.task.service.dao.SchBaseTask;
+import org.nl.wms.sch.task_manage.GeneralDefinition;
 import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
 import org.nl.wms.util.PointUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +46,9 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
     @Autowired
     private SchBaseRegionMapper regionMapper;
 
+    @Autowired
+    private SchBaseVehiclematerialgroupMapper vehiclematerialgroupMapper;
+
     @Override
     public IPage<SchBasePoint> queryAll(Map whereJson, PageQuery page,List<String> roles){
         String blurry = ObjectUtil.isNotEmpty(whereJson.get("blurry")) ? whereJson.get("blurry").toString() : null;
@@ -149,17 +155,45 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
             SchBaseRegion baseRegion = regionMapper.selectById(entity.getRegion_code());
             entity.setRegion_name(baseRegion.getRegion_name());
         }
-//        if (ObjectUtil.isNotEmpty(entity.getCan_vehicle_types())) {
-//            String can_vehicle_type = String.join(",", entity.getCan_vehicle_types());
-//            entity.setCan_vehicle_type(can_vehicle_type);
-//        }
-//        String pointStatus = entity.getPoint_status();
-//        // 根据点位状态来判断更新内容
-//        if (ObjectUtil.isNotEmpty(pointStatus) && pointStatus.equals(PointStatusEnum.EMPTY_POINT.getCode())) {
-//            entity.setVehicle_type("");
-//            entity.setVehicle_code("");
-//            entity.setVehicle_qty(0);
-//        }
+        pointMapper.updateById(entity);
+    }
+
+    @Override
+    public void updateByPc(SchBasePoint entity) {
+        log.info("管理端手动变更点位信息:{}",entity.toString());
+        String currentUserId = SecurityUtils.getCurrentUserId();
+        String nickName = SecurityUtils.getCurrentNickName();
+        String now = DateUtil.now();
+        entity.setUpdate_id(currentUserId);
+        entity.setUpdate_name(nickName);
+        entity.setUpdate_time(now);
+        if(ObjectUtil.isEmpty(entity.getRegion_name())){
+            // 获取region_name
+            SchBaseRegion baseRegion = regionMapper.selectById(entity.getRegion_code());
+            entity.setRegion_name(baseRegion.getRegion_name());
+        }
+        boolean is_change = entity.getIs_has_workder();
+        //同步修改组盘托盘号，且子托盘号不能为空
+        if(is_change && ObjectUtil.isNotEmpty(entity.getVehicle_code2())){
+            LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
+            lam.eq(SchBasePoint::getPoint_code,entity.getPoint_code());
+            SchBasePoint old_point = this.getOne(lam);
+            String old_vehicle_code2 = old_point.getVehicle_code2();
+            if(ObjectUtil.isNotEmpty(old_vehicle_code2) && old_vehicle_code2.startsWith("YBHC")){
+                //更新
+                UpdateWrapper<SchBaseVehiclematerialgroup> updateWrapper = new UpdateWrapper<>();
+                updateWrapper.eq("vehicle_code",old_vehicle_code2);
+                updateWrapper.le("group_bind_material_status","2");
+
+                updateWrapper.set("vehicle_code",entity.getVehicle_code2());
+                updateWrapper.set("source_vehicle_code",old_vehicle_code2);
+                updateWrapper.set("update_id",currentUserId);
+                updateWrapper.set("update_name",nickName);
+                updateWrapper.set("update_time",now);
+                vehiclematerialgroupMapper.update(null,updateWrapper);
+            }
+        }
+        entity.setIs_has_workder(false);
         pointMapper.updateById(entity);
     }
 
@@ -190,8 +224,7 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
         return pointMapper.selectList(new LambdaQueryWrapper<SchBasePoint>()
                 .eq(SchBasePoint::getRegion_code, region.getRegion_code())
                 .like(region.getPoint_code()!=null,SchBasePoint::getPoint_code, region.getPoint_code())
-                .eq(SchBasePoint::getIs_used, 1)
-                .eq(SchBasePoint::getIs_has_workder, 1));
+                .eq(SchBasePoint::getIs_used, 1));
     }
 
     @Override
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java
index b37f68f..8fa8724 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java
@@ -318,7 +318,7 @@ public class YCLCKTask extends AbstractTask {
                         qpmes065RequestBody.setLotSN(material.getPalletSN());
                         qty+=Double.parseDouble(material.getQty());
                         qpmes065RequestBody.setSiteName(material.getLocationCode());
-                        qpmes065RequestBody.setZXXV01(extGroupData.getString("workorder_code")!=null?"1":"0");
+                        qpmes065RequestBody.setZXXV01(ObjectUtil.isNotEmpty(extGroupData.getString("workorder_code"))?"1":"0");
                         qpmes065RequestBody.setZXXV02(taskObj.getVehicle_code());
                     }
                     qpmes065RequestBody.setQty(String.valueOf(qty));
@@ -333,13 +333,8 @@ public class YCLCKTask extends AbstractTask {
                     String code = result.getString("code");
                     if(ObjectUtil.isNotEmpty(code) && "0".equals(code)){
                         //更新接口表
-                        LambdaUpdateWrapper<Material> updateWrapper = new  LambdaUpdateWrapper<>();
-                        updateWrapper.eq(Material::getPalletSN,taskObj.getVehicle_code2());
-                        updateWrapper.eq(Material::getGroup_bind_material_status,GroupBindMaterialStatusEnum.BOUND.getValue());
-                        //回传状态为0的
-                        updateWrapper.eq(Material::getReturn_status,"1");
-                        updateWrapper.set(Material::getReturn_status,"2");
-                        materialMapper.update(null,updateWrapper);
+                        //pdm_bd_workorder_two任务完成时，status改为3
+                        workorderService.update(vehicleCode2,"4");
                     }
                 } else {
                     log.error("当前子托盘:" + taskObj.getVehicle_code2() + "不存在未解绑的物料信息，请确认！");
diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
index 78325a6..b138921 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
@@ -33,27 +33,12 @@
           label-width="90px"
           label-suffix=":"
         >
-          <el-form-item label="所属车间">
-            <el-select
-              v-model="query.workshop_code"
-              clearable
-              size="mini"
-              placeholder="所属车间"
-              class="filter-item"
-            >
-              <el-option
-                v-for="item in workShopList"
-                :label="item.workshop_name"
-                :value="item.workshop_code"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="模糊搜索">
+          <el-form-item label="点位编码">
             <el-input
               v-model="query.blurry"
               clearable
               size="mini"
-              placeholder="编码名称"
+              placeholder="模糊查询"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
@@ -91,23 +76,6 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="点位状态">
-            <el-select
-              v-model="query.point_status"
-              clearable
-              filterable
-              size="mini"
-              placeholder="点位状态"
-              class="filter-item"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in pointStatusList"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
           <el-form-item label="母托盘编码">
             <el-input
               v-model="query.vehicle_code"
@@ -177,8 +145,8 @@
         </el-button>
       </crudOperation>
       <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="540px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;">
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="640px">
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="150px" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;">
           <el-form-item label="所属车间">
             <el-select
               v-model="form.workshop_code"
@@ -207,10 +175,10 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="点位编码" prop="point_code">
+          <el-form-item label="点位编码" prop="point_code" disabled >
             <el-input v-model="form.point_code" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="点位名称" prop="point_name">
+          <el-form-item label="点位名称" prop="point_name" disabled >
             <el-input v-model="form.point_name" style="width: 370px;" />
           </el-form-item>
           <el-form-item v-if="pointStatusDialogList.length > 0" label="点位状态" prop="point_status">
@@ -259,7 +227,7 @@
           <el-form-item label="载具数量" prop="vehicle_qty">
             <el-input-number v-model="form.vehicle_qty" style="width: 370px;" :controls="false" class="clear-number-input" :min="0" :precision="0" :max="99999" label="载具数量" size="mini" />
           </el-form-item>
-          <el-form-item label="是否有工单">
+          <el-form-item label="是否更新组盘托盘号">
             <el-radio v-for="item in dict.TrueOrFalse" :key="item.id" v-model="form.is_has_workder" :label="item.value">{{ item.label }}</el-radio>
           </el-form-item>
           <el-form-item label="是否自动">
@@ -282,7 +250,6 @@
         <el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
         <el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')" />
         <el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
-        <el-table-column prop="point_status_name" label="点位状态" :min-width="flexWidth('point_status_name',crud.data,'点位类型')" />
         <el-table-column prop="vehicle_code" label="母托盘编码" :min-width="flexWidth('vehicle_code',crud.data,'母托盘编码')" />
         <el-table-column prop="vehicle_code2" label="子托盘编码" :min-width="flexWidth('vehicle_code2',crud.data,'子托盘编码')" />
         <el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')" />
@@ -296,11 +263,6 @@
         <el-table-column prop="row_num" label="排" :min-width="flexWidth('row_num',crud.data,'排')" />
         <el-table-column prop="col_num" label="列" :min-width="flexWidth('col_num',crud.data,'列')" />
         <el-table-column prop="layer_num" label="层" :min-width="flexWidth('layer_num',crud.data,'层')" />
-        <el-table-column prop="is_has_workder" label="是否有工单" :min-width="flexWidth('is_has_workder',crud.data,'是否有工单')">
-          <template slot-scope="scope">
-            {{ scope.row.is_has_workder?'是':'否' }}
-          </template>
-        </el-table-column>
         <el-table-column prop="is_auto" label="是否自动" :min-width="flexWidth('is_auto',crud.data,'是否自动')">
           <template slot-scope="scope">
             {{ scope.row.is_auto?'是':'否' }}
@@ -312,8 +274,6 @@
             {{ scope.row.is_used?'是':'否' }}
           </template>
         </el-table-column>
-        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
-        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
         <el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
         <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
@@ -379,7 +339,7 @@ const defaultForm = {
   parent_point_code: null,
   ext_point_code: null,
   ing_task_code: null,
-  is_has_workder: 'true',
+  is_has_workder: 'false',
   workshop_code: null,
   is_auto: 'true',
   remark: null,
@@ -454,8 +414,10 @@ export default {
       return true
     },
     [CRUD.HOOK.beforeToCU]() {
-      this.form.is_has_workder = this.form.is_has_workder.toString()
+      console.log('1beforeToCU'+this.form.is_has_workder.toString())
+      this.form.is_has_workder = 'false'
       this.form.is_auto = this.form.is_auto.toString()
+      console.log('2beforeToCU'+this.form.is_has_workder)
     },
     [CRUD.HOOK.afterToCU]() {
       if (this.form.region_code) {
@@ -584,9 +546,12 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        this.crud.loading = true
         console.log('提交')
         this.crud.submitCU('form')
+        this.crud.loading = false
       }).catch(() => {
+        this.crud.loading = false
         this.$message({
           type: 'info',
           message: '已取消删除'