1.完善理料、划线、切割派工及反馈功能

src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java

@@ -352,6 +352,10 @@ public class DmYdjh implements Serializable {
         return ZyjhzxEnum.SLFK.code;
     }
 
+    public static String getLLZt(){
+        return ZyjhzxEnum.LLFK.code;
+    }
+
     public void setZtByZyjhzx(String type){
         ZyjhzxEnum zyjhzxEnum = ZyjhzxEnum.valueOf(type);
         if (zyjhzxEnum==null){

src/main/java/com/dsic/gj_erp/bean/zyjh/Ycldw.java

@@ -18,12 +18,14 @@ public class Ycldw {
     @TableId(type = IdType.AUTO)
     private Integer id;
     private String name;
+    private DwTypeEnum type;
+    private String tzbh;
 
     @TableField(exist = false)
     private List<YcldwInfo> list;
 
 
-    private enum DwTypeEnum{
+    public enum DwTypeEnum{
         YCL,//预处理垛位
         LLJ,//理料间垛位
         YPP,//预配盘垛位

src/main/java/com/dsic/gj_erp/controller/pgd/PgdTzjhController.java

@@ -129,7 +129,7 @@ public class PgdTzjhController {
         List<Map> bmbm = syService.em_sbjbb_ZM("bmbm");
         // 多为
         List<DmDwxxp> dwxx = dwxxpService.list();
-        List<Ycldw> ycldws = ycldwService.ycldwList();
+        List<Ycldw> ycldws = ycldwService.ycldwList("ycl");
         returnMap.put("cbbm", cbbm);
         returnMap.put("gxry", gxry);
         returnMap.put("ycldws", ycldws);

src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jhgk.DmYdjh;
+import com.dsic.gj_erp.bean.zyjh.Ycldw;
 import com.dsic.gj_erp.bean.zyjh.YcldwInfo;
 import com.dsic.gj_erp.controller.zyjh.dto.*;
 import com.dsic.gj_erp.exception.ServiceException;
@@ -60,6 +61,18 @@ public class ZyjhController {
                 ycldwInfoService.updatePw(dto.getYcldwInfo());
                 wsHandler.sendPwComplete((JSONObject) JSONObject.toJSON(dto.getYcldwInfo()));
             }
+            if ("HXFK".equals(dto.getZxZtName())){
+                ycldwInfoService.updatePw(dto.getYcldwInfo());
+                wsHandler.sendHXComplete((JSONObject) JSONObject.toJSON(dto.getYcldwInfo()));
+            }
+            if ("QGFK".equals(dto.getZxZtName())){
+                //无需划线,从理料间获取时才更新垛位信息
+                if ("42".equals(dto.getZt())){
+                    ycldwInfoService.updatePw(dto.getYcldwInfo());
+                }
+                wsHandler.sendHXComplete((JSONObject) JSONObject.toJSON(dto.getYcldwInfo()));
+                wsHandler.sendQGComplete((JSONObject) JSONObject.toJSON(dto.getYcldwInfo()));
+            }
             zyjhService.updateBatchById(list);
 
             return new ResultBean<>();
@@ -175,8 +188,8 @@ public class ZyjhController {
      * 获取预处理垛位信息
      */
     @PostMapping("ycldw")
-    public ResultBean<?> ycldw(){
-        return new ResultBean<>(ycldwService.ycldwList());
+    public ResultBean<?> ycldw(String type){
+        return new ResultBean<>(ycldwService.ycldwList(type));
     }
 
 
@@ -206,6 +219,7 @@ public class ZyjhController {
             shangLiao.setSljhrq(dmYdjh.getSljhrq());
             shangLiao.setQgjhrq(dmYdjh.getSljhrq());
             shangLiao.setBfr( (String) request.getAttribute("yhms"));
+            shangLiao.setType(Ycldw.DwTypeEnum.YCL);
             //更新预处理垛位信息
             if (!shangLiao.checkCkwp()){
                 //throw new ServiceException(10009,"物品库存不存在,或库存信息错误");
@@ -244,7 +258,15 @@ public class ZyjhController {
 
         //todo 更新库存信息
 
-        wsHandler.sendSlComplete((JSONObject)JSONObject.toJSON(info));
+        switch (sl.getType()){
+            case YCL:
+                wsHandler.sendSlComplete((JSONObject)JSONObject.toJSON(info));
+                break;
+            case LLJ:
+                wsHandler.sendLLComplete((JSONObject)JSONObject.toJSON(info));
+                break;
+        }
+
         return new ResultBean<>();
     }
 

src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgDto.java

@@ -14,6 +14,7 @@ public class PgDto {
     private String fieldry;
     private String zxZtName;
     private List<DmYdjh> list;
+    private String zt;
 
     private YcldwInfo ycldwInfo;
 }

src/main/java/com/dsic/gj_erp/controller/zyjh/dto/ShangLiao.java

@@ -3,6 +3,7 @@ package com.dsic.gj_erp.controller.zyjh.dto;
 import cn.hutool.core.util.ObjUtil;
 import com.dsic.gj_erp.bean.jhgk.DmYdjh;
 import com.dsic.gj_erp.bean.kc.ImCkwpkwp;
+import com.dsic.gj_erp.bean.zyjh.Ycldw;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -28,6 +29,7 @@ public class ShangLiao {
     private String sljhrq;
     private String qgjhrq;
     private String bfr;//摆放人
+    private Ycldw.DwTypeEnum type;//垛位类型
 
     public boolean checkCkwp(){
         return ObjUtil.isNotEmpty(this.ckwpkwp);

src/main/java/com/dsic/gj_erp/mapper/zyjh/YcldwMapper.java

@@ -7,6 +7,5 @@ import java.util.List;
 
 public interface YcldwMapper extends BaseMapper<Ycldw> {
 
-    List<Ycldw> ycldwList();
-
+    List<Ycldw> ycldwList(String type);
 }

src/main/java/com/dsic/gj_erp/service/pgsc/impl/PbscServiceImpl.java

@@ -1,9 +1,6 @@
 package com.dsic.gj_erp.service.pgsc.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsic.gj_erp.bean.pbsc.ImCrklsz;
-import com.dsic.gj_erp.mapper.pbsc.ImCrklszMapper;
-import com.dsic.gj_erp.service.pgsc.ImCrklszService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/dsic/gj_erp/service/zyjh/YcldwService.java

@@ -10,8 +10,8 @@ import java.util.List;
 @Service
 public class YcldwService extends ServiceImpl<YcldwMapper, Ycldw> {
 
-    public List<Ycldw> ycldwList(){
-        return baseMapper.ycldwList();
+    public List<Ycldw> ycldwList(String type){
+        return baseMapper.ycldwList(type);
     }
 
 }

src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java

@@ -1,5 +1,6 @@
 package com.dsic.gj_erp.service.zyjh;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.jhgk.DmYdjh;
@@ -11,13 +12,22 @@ import org.springframework.stereotype.Service;
 public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
 
     public void updateForSl(ShangLiao sl){
-        this.update(Wrappers.<DmYdjh>lambdaUpdate()
-                .set(DmYdjh::getZt,DmYdjh.getSlZt())
-                .set(DmYdjh::getSlkcdw,sl.getYdjh().getSlkcdw())
-                .set(DmYdjh::getSlcs,sl.getYdjh().getSlcs())
-                .set(DmYdjh::getSlfkrq,sl.getYdjh().getSlfkrq())
-                .set(DmYdjh::getSlfkry,sl.getYdjh().getSlfkry())
-                .eq(DmYdjh::getId,sl.getYdjh().getId())
-        );
+        LambdaUpdateWrapper<DmYdjh> wrapper = Wrappers.<DmYdjh>lambdaUpdate()
+                .set(DmYdjh::getSlkcdw, sl.getYdjh().getSlkcdw())
+                .set(DmYdjh::getSlcs, sl.getYdjh().getSlcs())
+                .set(DmYdjh::getSlfkrq, sl.getYdjh().getSlfkrq())
+                .set(DmYdjh::getSlfkry, sl.getYdjh().getSlfkry())
+                .eq(DmYdjh::getId, sl.getYdjh().getId());
+
+        switch (sl.getType()){
+            case YCL:
+                wrapper.set(DmYdjh::getZt, DmYdjh.getSlZt());
+                break;
+            case LLJ:
+                wrapper.set(DmYdjh::getZt, DmYdjh.getLLZt());
+        }
+
+
+        this.update(wrapper);
     }
 }

src/main/java/com/dsic/gj_erp/ws/WsHandler.java

@@ -45,4 +45,16 @@ public class WsHandler {
     public void sendPwComplete(JSONObject object) {
         socketIOServer.getBroadcastOperations().sendEvent("pwComplete", object);
     }
+
+    public void sendLLComplete(JSONObject object) {
+        socketIOServer.getBroadcastOperations().sendEvent("llComplete", object);
+    }
+
+    public void sendHXComplete(JSONObject object) {
+        socketIOServer.getBroadcastOperations().sendEvent("hxComplete", object);
+    }
+
+    public void sendQGComplete(JSONObject object) {
+        socketIOServer.getBroadcastOperations().sendEvent("qgComplete", object);
+    }
 }

src/main/resources/mappers/zyjh/YcldwMapper.xml

@@ -5,6 +5,8 @@
     <resultMap id="ycldwVo" type="ycldw">
         <id column="id" property="id" jdbcType="VARCHAR" />
         <result column="name" property="name" jdbcType="VARCHAR" />
+        <result column="type" property="type" jdbcType="VARCHAR" />
+        <result column="tzbh" property="tzbh" jdbcType="VARCHAR" />
         <collection property="list" ofType="ycldwInfo" javaType="java.util.ArrayList" columnPrefix="info_" >
             <id column="id" property="id" jdbcType="INTEGER" />
             <result column="dw_id" property="dwId" jdbcType="INTEGER" />
@@ -33,10 +35,13 @@
 
     <select id="ycldwList" resultMap="ycldwVo">
         select
-            a.id,a.name,
+            a.id,a.name,a.type,a.tzbh,
             <include refid="ycldwInfo" />
         from
             ycldw a left join ycldw_info b on a.id=b.dw_id AND b.zt='BF'
-        order by a.id,ceng
+        <where>
+            <if test="type!=null and type!=''">a.type = #{type}</if>
+        </where>
+        order by a.tzbh,ceng
     </select>
 </mapper>