|
|
@ -589,8 +589,10 @@ public class PgdSljhController {
|
|
|
|
dmYdjh.setKcch(slKc.getDCCH());
|
|
|
|
dmYdjh.setKcch(slKc.getDCCH());
|
|
|
|
dmYdjh.setId(slKc.getYdid());
|
|
|
|
dmYdjh.setId(slKc.getYdid());
|
|
|
|
|
|
|
|
|
|
|
|
// 修改跨位 // 修改作业区
|
|
|
|
|
|
|
|
DmYdjh byId = dmYdjhService.getById(slKc.getYdid());
|
|
|
|
DmYdjh byId = dmYdjhService.getById(slKc.getYdid());
|
|
|
|
|
|
|
|
if(!byId.getKw().equals(slKc.getSLDW())){
|
|
|
|
|
|
|
|
// 修改跨位 // 修改作业区
|
|
|
|
|
|
|
|
|
|
|
|
if("1".equals(slKc.getSLDW()) || "13".equals(slKc.getSLDW()) || "14".equals(slKc.getSLDW()) ||"3".equals(slKc.getSLDW())
|
|
|
|
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())
|
|
|
|
|| "6".equals(slKc.getSLDW())|| "7".equals(slKc.getSLDW())||"8".equals(slKc.getSLDW())
|
|
|
@ -617,6 +619,10 @@ public class PgdSljhController {
|
|
|
|
dmYdjh.setKw(slKc.getSLDW());
|
|
|
|
dmYdjh.setKw(slKc.getSLDW());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ups.add(dmYdjh);
|
|
|
|
ups.add(dmYdjh);
|
|
|
|