diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java index 04bee48..00b5ee0 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java @@ -372,6 +372,7 @@ public class DmYdjh implements Serializable { private String zyq; private String zyq1; + private String ykw; @TableField(exist = false) diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java index 05cf26d..83e2204 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java @@ -532,6 +532,8 @@ public class PgdSljhController { imCkwpkwp.setDcTh(slKc.getDCTH()); imCkwpkwp.setYdid(slKc.getYdid()); + + if(StringUtils.isBlank(slKc.getYdid())){ // 手工进行 批量了 String cjs=""; @@ -586,6 +588,37 @@ public class PgdSljhController { dmYdjh.setSlwlh(slKc.getWPH()); dmYdjh.setKcch(slKc.getDCCH()); dmYdjh.setId(slKc.getYdid()); + + // 修改跨位 // 修改作业区 + DmYdjh byId = dmYdjhService.getById(slKc.getYdid()); + + if("1".equals(slKc.getSLDW()) || "13".equals(slKc.getSLDW()) || "14".equals(slKc.getSLDW()) ||"3".equals(slKc.getSLDW()) + || "6".equals(slKc.getSLDW())|| "7".equals(slKc.getSLDW())||"8".equals(slKc.getSLDW()) + ){ + dmYdjh.setZyq("FP2Q"); + dmYdjh.setZyq1("二区"); + dmYdjh.setYkw(byId.getKw()); + dmYdjh.setKw(slKc.getSLDW()); + } + if("10".equals(slKc.getSLDW()) || "11".equals(slKc.getSLDW()) || "12".equals(slKc.getSLDW()) ||"2".equals(slKc.getSLDW()) + || "5".equals(slKc.getSLDW())|| "9".equals(slKc.getSLDW()) + ){ + dmYdjh.setZyq("FP3Q"); + dmYdjh.setZyq1("三区"); + dmYdjh.setYkw(byId.getKw()); + dmYdjh.setKw(slKc.getSLDW()); + } + + if("4".equals(slKc.getSLDW())|| "15".equals(slKc.getSLDW()) + ){ + dmYdjh.setZyq("FP4Q"); + dmYdjh.setZyq1("四区"); + dmYdjh.setYkw(byId.getKw()); + dmYdjh.setKw(slKc.getSLDW()); + } + + + ups.add(dmYdjh); } ups1.add(imCkwpkwp);