1.各种调整

src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java

@@ -35,8 +35,8 @@ public class EmSbcnp implements Serializable {
         @ApiModelProperty(value = "加工跨")
         private String kw;
 
-
         private String gx;
+
         private String jldw;
 
         @ApiModelProperty(value = "定额工时")
@@ -61,11 +61,15 @@ public class EmSbcnp implements Serializable {
 
         @ApiModelProperty(value = "夜班定额工时")
         private Double degsYb;
+
         @ApiModelProperty(value = "所属部门")
         private String szcs;
 
         @ApiModelProperty(value = "默认设备")
         private String sbmc;
+
         private String sbbh;
 
+        private String zyq;//作业区
+
 }

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

@@ -39,10 +39,12 @@ public class YcldwInfo {
     private String bfr;//摆放人
     private String bfrq;//摆放日期
     private ZtEnum zt;
+    private String djh;//工单号
 
     public static YcldwInfo ofSl(ShangLiao sl){
         YcldwInfo info=new YcldwInfo();
         BeanUtil.copyProperties(sl,info);
+        info.setDjh(sl.getYdjh().getDjh());
         info.sl();
         return info;
     }

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

@@ -165,8 +165,8 @@ public class ZyjhController {
      * 按状态获取可派工作业计划的批次信息
      */
     @GetMapping("getYdjhByZt")
-    public ResultBean<?> getYdjhByZt(String zt,String wgzt,String wclzt){
+    public ResultBean<?> getYdjhByZt(String zt,String wgzt,String wclzt,String zyq){
-        return new ResultBean<>(zyjhService.getYdjhByZt(zt,wgzt,wclzt));
+        return new ResultBean<>(zyjhService.getYdjhByZt(zt,wgzt,wclzt,zyq));
     }
 
     /**

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

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

src/main/java/com/dsic/gj_erp/service/KbanService.java

@@ -218,8 +218,8 @@ public class KbanService {
             }
         });
         List<Integer> zsl = Arrays.asList(sl.get(),kw1.get(),kw2.get(),kw3.get(),kw4.get());
-        List<Integer> kwc = Arrays.asList(slc.get(),kw2c.get(),kw3c.get(),kw4c.get());
+        List<Integer> kwc = Arrays.asList(slc.get(),kw1.get(),kw2c.get(),kw3c.get(),kw4c.get());
-        List<Integer> wcl = Arrays.asList(sl.get()-slc.get(),kw2.get()-kw2c.get(),kw3.get()-kw3c.get(),kw4.get()-kw4c.get());
+        List<Integer> wcl = Arrays.asList(sl.get()-slc.get(),kw1.get()-kw1c.get(),kw2.get()-kw2c.get(),kw3.get()-kw3c.get(),kw4.get()-kw4c.get());
         map.put("zsl",zsl);//总数量
         map.put("kwc",kwc);//完成数量
         map.put("wcl",wcl);//未处理

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

@@ -55,11 +55,11 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
         return list(wrapper);
     }
 
-    public List<Map<String,Object>> getYdjhByZt(String zt,String wgzt,String wclzt){
+    public List<Map<String,Object>> getYdjhByZt(String 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");
-        return baseMapper.getYdjhByZt(zt,wgzt,wclzt,from,to);
+        return baseMapper.getYdjhByZt(zyq,zt,wgzt,wclzt,from,to);
     }
 
 

src/main/resources/application-localws.yml

@@ -9,5 +9,5 @@ ws:
   maxHttpContentLength: 1048576
   maxFramePayloadLength: 1048576
   client:
-    url: ws://192.168.13.10:9000
+    url: ws://192.127.2.9:9000
-    id: 100000000001
+    id: 100000000002

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

@@ -28,13 +28,14 @@
             <result column="wlh" property="wlh" jdbcType="VARCHAR" />
             <result column="nbsbm" property="nbsbm" jdbcType="VARCHAR" />
             <result column="lph" property="lph" jdbcType="VARCHAR" />
+            <result column="djh" property="djh" jdbcType="VARCHAR" />
         </collection>
     </resultMap>
 
     <sql id="ycldwInfo" >
         b.id info_id,b.dw_id info_dw_id,b.ceng info_ceng,b.czbh info_czbh,b.pl info_pl,b.fd info_fd,b.kw info_kw,b.zl info_zl,
             b.tlth info_tlth,b.wpgg info_wpgg,b.wph info_wph,b.sljhrq info_sljhrq,b.qgjhrq info_qgjhrq,b.bfr info_bfr,
-            b.bfrq info_bfrq,b.zt info_zt,b.ydid info_ydid,b.wlh info_wlh,b.nbsbm info_nbsbm,b.lph info_lph
+            b.bfrq info_bfrq,b.zt info_zt,b.ydid info_ydid,b.wlh info_wlh,b.nbsbm info_nbsbm,b.lph info_lph,b.djh info_djh
     </sql>
 
     <select id="ycldwList" resultMap="ycldwVo">