1.优化调整,修复bug

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

@@ -406,6 +406,7 @@ public class DmYdjh implements Serializable {
 
     @AllArgsConstructor
     private enum ZyjhzxEnum{
+        YXF("2",2),
         SLPP("11",11),  // 上料匹配  比对库存给上垛位
         SLFK("21",21),
         PWPG("31",31),

src/main/java/com/dsic/gj_erp/controller/jhgk/DmQfxqController.java

@@ -51,7 +51,7 @@ public class DmQfxqController {
                 .eq(StrUtil.isNotEmpty(qfxq.getDcCh()), "dc_ch", qfxq.getDcCh())
                 .eq(StrUtil.isNotEmpty(qfxq.getXzglxq()), "substring(Xzglxq,0,8) ", qfxq.getXzglxq())
                 .eq(StrUtil.isNotEmpty(qfxq.getZt()), "zt", qfxq.getZt())
-                .orderByAsc("DC_CH,cast(dc_pl as int),DC_FD"));
+                .orderByAsc("DC_CH,dc_pl,DC_FD"));
         return new ResultBean(list);
     }
 

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

@@ -106,17 +106,17 @@ public class ZyjhController {
                 }
             }
             if ("PWFK".equals(dto.getZxZtName())){
-                ycldwInfoService.updatePw(dto.getYcldwInfo());
+//                ycldwInfoService.updatePw(dto.getYcldwInfo());
                 wsHandler.sendPwComplete((JSONObject) JSONObject.toJSON(dto.getYcldwInfo()));
             }
             if ("HXFK".equals(dto.getZxZtName())){
-                ycldwInfoService.updatePw(dto.getYcldwInfo());
+//                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());
+//                    ycldwInfoService.updatePw(dto.getYcldwInfo());
                 }
                 wsHandler.sendHXComplete((JSONObject) JSONObject.toJSON(dto.getYcldwInfo()));
                 wsHandler.sendQGComplete((JSONObject) JSONObject.toJSON(dto.getYcldwInfo()));

src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmQfxqServiceImpl.java

@@ -101,6 +101,7 @@ public class DmQfxqServiceImpl extends ServiceImpl<DmQfxqMapper, DmQfxq> impleme
                 l.setDrr(username);
                 l.setDrrq(day);
                 l.setXqzt("0");
+                l.setZt("0");
                 this.save(l);
                 list1.add(l);
             }

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

@@ -61,23 +61,23 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
 
     public void pgWithForeman(PgWithPcDto dto){
         LambdaUpdateWrapper<DmYdjh> wrapper = new LambdaUpdateWrapper<DmYdjh>()
-                .eq(DmYdjh::getDcCh,dto.getDcCh()).eq(DmYdjh::getDcPl,dto.getDcPl()).ge(DmYdjh::getZt,"2");
+                .eq(DmYdjh::getDcCh,dto.getDcCh()).eq(DmYdjh::getDcPl,dto.getDcPl()).ge(DmYdjh::getZt,2);
 
         String pgrq = DateUtil.date().toString("yyyy/MM/dd");
         switch (dto.getZt()){
             case "21":
                 wrapper.set(DmYdjh::getPwpgrq,pgrq).set(DmYdjh::getPwpgry,dto.getForemanId());
-                wrapper.lt(DmYdjh::getZt,"31");//仅处理未派工的数据
+                wrapper.lt(DmYdjh::getZt,31);//仅处理未派工的数据
                 break;
             case "42":
             case "52":
                 if ("HXPG".equals(dto.getZxZtName())){
                     wrapper.set(DmYdjh::getHxpgrq,pgrq).set(DmYdjh::getHxpgry,dto.getForemanId());
-                    wrapper.lt(DmYdjh::getZt,"51");//仅处理未派工的数据
+                    wrapper.lt(DmYdjh::getZt,51);//仅处理未派工的数据
                 }
                 if ("QGPG".equals(dto.getZxZtName())){
                     wrapper.set(DmYdjh::getQgpgrq,pgrq).set(DmYdjh::getQgpgry,dto.getForemanId());
-                    wrapper.lt(DmYdjh::getZt,"61");//仅处理未派工的数据
+                    wrapper.lt(DmYdjh::getZt,61);//仅处理未派工的数据
                 }
                 break;
         }

src/main/resources/mappers/jhgk/DmYdjhMapper.xml

@@ -931,7 +931,7 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl}
             </if>
         from
             dm_ydjh
-        where zt>=2 and zt&lt;=62
+        where zt>=11 and zt&lt;=62
         group by dc_ch, dc_pl,plxh
         order by dc_ch,dc_pl
     </select>