Merge remote-tracking branch 'origin/master'

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

@@ -398,6 +398,9 @@ public class DmYdjh implements Serializable {
     public void setZtForSl(){
         this.zt=ZyjhzxEnum.SLFK.code;
     }
+    public void setForPwpg(){
+        this.zt=ZyjhzxEnum.PWPG.code;
+    }
     public void setZtForHXFK(){
         this.zt=ZyjhzxEnum.HXFK.code;
     }

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

@@ -142,7 +142,7 @@ public class PgdTzjhController {
         returnMap.put("dwxxs1", dwxxs);
 
 
-        List<Ycldw> ycldws = ycldwService.ycldwList("ycl");
+        List<Ycldw> ycldws = ycldwService.ycldwList("ycl","BF");
         returnMap.put("cbbm", cbbm);
         returnMap.put("gxry", gxry);
         returnMap.put("ycldws", ycldws);
@@ -206,7 +206,7 @@ public class PgdTzjhController {
         returnMap.put("dwxxs1", dwxxs);
 
 
-        List<Ycldw> ycldws = ycldwService.ycldwList("ycl");
+        List<Ycldw> ycldws = ycldwService.ycldwList("ycl","BF");
         returnMap.put("cbbm", cbbm);
         returnMap.put("gxry", gxry);
         returnMap.put("ycldws", ycldws);

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

@@ -156,7 +156,7 @@ public class ZyjhController {
      * 根据状态或班组长,获取作业计划,用于报工
      */
     @GetMapping("getYdjhByZtOrForeman")
-    public ResultBean<?> getYdjhByZtOrForeman(String zt,String foreman){
+    public ResultBean<?> getYdjhByZtOrForeman(Integer zt,String foreman){
         List<DmYdjh> list = zyjhService.getYdjhByZtOrForeman(zt, foreman);
         return new ResultBean<>(list);
     }
@@ -165,7 +165,7 @@ public class ZyjhController {
      * 按状态获取可派工作业计划的批次信息
      */
     @GetMapping("getYdjhByZt")
-    public ResultBean<?> getYdjhByZt(String zt,String wgzt,String wclzt,String zyq){
+    public ResultBean<?> getYdjhByZt(Integer zt,String wgzt,String wclzt,String zyq){
         return new ResultBean<>(zyjhService.getYdjhByZt(zt,wgzt,wclzt,zyq));
     }
 
@@ -209,6 +209,7 @@ public class ZyjhController {
             dmYdjh.setId(item.getYdid());
             dmYdjh.setPwpgry(dto.getWorker());
             dmYdjh.setPwpgrq(date);
+            dmYdjh.setForPwpg();
             ydjhList.add(dmYdjh);
             return YcldwInfo.ofPwpg(item);
         }).collect(Collectors.toList());
@@ -423,8 +424,8 @@ public class ZyjhController {
      * 获取预处理垛位信息
      */
     @PostMapping("ycldw")
-    public ResultBean<?> ycldw(String type){
+    public ResultBean<?> ycldw(String type,String lx){
-        return new ResultBean<>(ycldwService.ycldwList(type));
+        return new ResultBean<>(ycldwService.ycldwList(type,lx));
     }
 
     @GetMapping("dw")

src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java

@@ -66,7 +66,7 @@ public interface DmYdjhMapper extends BaseMapper<DmYdjh> {
 
     List<Map<String,Object>> getWcl();
 
-    List<Map<String,Object>> getYdjhByZt(String zyq,String zt,String wgzt,String wclzt,String from, String to);
+    List<Map<String,Object>> getYdjhByZt(String zyq,Integer zt,String wgzt,String wclzt,String from, String to);
 
     void xzylbs(String dcch,String dcpl);
 }

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

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

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(String type){
+    public List<Ycldw> ycldwList(String type,String lx){
-        return baseMapper.ycldwList(type);
+        return baseMapper.ycldwList(type,lx);
     }
 
 }

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

@@ -36,18 +36,18 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
     private final DmCbxxpService dmCbxxpService;
     private final RedisTemplate<String,Object> redisTemplate;
 
-    public List<DmYdjh> getYdjhByZtOrForeman(String zt,String foreman){
+    public List<DmYdjh> getYdjhByZtOrForeman(Integer zt,String foreman){
         QueryWrapper<DmYdjh> wrapper = new QueryWrapper<DmYdjh>()
-                .ge("zt",11);
+                .ge("zt",11).ge(ObjUtil.isNotEmpty(zt),"zt",zt);
 
         switch (zt){
-            case "31":
+            case 31:
                 wrapper.eq("pwpgry",foreman).isNull("pwfkry");
                 break;
-            case "51":
+            case 51:
                 wrapper.eq("hxpgry",foreman).isNull("hxfkry");
                 break;
-            case "61":
+            case 61:
                 wrapper.eq("qgpgry",foreman).isNull("qgfkry");
                 break;
         }
@@ -55,7 +55,7 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
         return list(wrapper);
     }
 
-    public List<Map<String,Object>> getYdjhByZt(String zt,String wgzt,String wclzt,String zyq){
+    public List<Map<String,Object>> getYdjhByZt(Integer zt,String wgzt,String wclzt,String zyq){
         DateTime date = DateUtil.date();
         String from = DateUtil.beginOfMonth(date).toString("yyyy/MM/dd");
         String to = DateUtil.endOfMonth(date).toString("yyyy/MM/dd");
@@ -65,7 +65,7 @@ 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,32);
 
         String pgrq = DateUtil.date().toString("yyyy/MM/dd");
         switch (dto.getZt()){
@@ -76,11 +76,11 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
             case "42":
             case "52":
                 if ("HXPG".equals(dto.getZxZtName())){
-                    wrapper.set(DmYdjh::getHxpgrq,pgrq).set(DmYdjh::getHxpgry,dto.getForemanId());
+                    wrapper.set(DmYdjh::getHxpgrq,pgrq).set(DmYdjh::getHxpgry,dto.getForemanId()).set(DmYdjh::getZt,"51");
                     wrapper.lt(DmYdjh::getZt,51);//仅处理未派工的数据
                 }
                 if ("QGPG".equals(dto.getZxZtName())){
-                    wrapper.set(DmYdjh::getQgpgrq,pgrq).set(DmYdjh::getQgpgry,dto.getForemanId());
+                    wrapper.set(DmYdjh::getQgpgrq,pgrq).set(DmYdjh::getQgpgry,dto.getForemanId()).set(DmYdjh::getZt,"61");
                     wrapper.lt(DmYdjh::getZt,61);//仅处理未派工的数据
                 }
                 break;

src/main/java/com/dsic/gj_erp/wsclient/WebSocketService.java

@@ -48,8 +48,12 @@ public class WebSocketService extends TextWebSocketHandler {
     }
 
     public void connect(String uri) {
-        WebSocketConnectionManager manager = new WebSocketConnectionManager(client, this, uri);
+        try {
-        manager.start();
+            WebSocketConnectionManager manager = new WebSocketConnectionManager(client, this, uri);
+            manager.start();
+        }catch (Exception e) {
+            log.error("无法连接语音服务器:{},{}",this.url, e.getMessage());
+        }
     }
 
     public void disconnect() throws Exception {
@@ -95,7 +99,7 @@ public class WebSocketService extends TextWebSocketHandler {
                 System.out.println("心跳");
                 this.sendMessage(message.toString());
             } catch (Exception e) {
-                e.printStackTrace();
+                log.error("语音服务器连接失效");
                 this.connect(this.url);
             }
         });

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

@@ -43,9 +43,10 @@
             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'
+            ycldw a left join ycldw_info b on a.id=b.dw_id
         <where>
             <if test="type!=null and type!=''">a.type = #{type}</if>
+            <if test="lx!=null and lx!=''">AND b.zt=#{lx}</if>
         </where>
         order by a.id,ceng
     </select>