Merge remote-tracking branch 'origin/master'

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

@@ -339,18 +339,19 @@ public class DmYdjh implements Serializable {
     // 切割信息
     private String qgdw; // 取自理料垛位
     private Integer qgcs; // 取自层数
-    private String qgpgry; // 划线派工人
-    private String qgpgrq; // 划线派工日期
-    private String qgfkrq; // 划线反馈日期
-    private String qgfkry; // 划线反馈人员
-    private String qgjybs; // 划线借用标识
-    private String qgjych; // 划线借用船号
-    private String qgjypl; // 划线借用批量
-    private String qgjyfd; // 划线借用分段
-    private String qgjyzl; // 划线借用组立
-    private String qgjykw; // 划线借用跨位
-    private String qgjytlth; // 划线借用套料图号
-    private String qgbz; // 划线备注
+    private String qgpgry; // 切割派工人
+    private String qgpgrq; // 切割派工日期
+    private String qgfkrq; // 切割反馈日期
+    private String qgfkry; // 切割反馈人员
+    private String qgllgs; // 切割理论工时
+    private String qgjybs; // 切割借用标识
+    private String qgjych; // 切割借用船号
+    private String qgjypl; // 切割借用批量
+    private String qgjyfd; // 切割借用分段
+    private String qgjyzl; // 切割借用组立
+    private String qgjykw; // 切割借用跨位
+    private String qgjytlth; // 切割借用套料图号
+    private String qgbz; // 切割备注
 
     // 标识信息
     private String qjgbs; // 曲加工标识

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

@@ -1577,8 +1577,10 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
             CAST(SUM(CASE WHEN dm_ydjh.kw='17' THEN bclqzl ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_gd,
             CAST(SUM(CASE WHEN dm_ydjh.kw='17' THEN bcshzl ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_gd
         from dm_ydjh
-        WHERE zt='62'
-          and dm_ydjh.dc_ch=#{ch}  GROUP BY dc_ch,dc_pl ORDER BY dc_pl
+        WHERE
+            dm_ydjh.dc_ch=#{ch}
+        GROUP BY dc_ch,dc_pl
+        ORDER BY dc_pl
     </select>
     <select id="getRjh" resultType="com.dsic.gj_erp.bean.jhgk.dto.RjhDto">
         SELECT