md

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java

@@ -194,7 +194,30 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
                 if("1".equals(emisSettleSubBill.getBlConfirmCenter())){
                     throw new EmisBizError(EmisBizErrorType.FAIL,"财务已确认账单，不允许审核，请先取消财务确认！");
                 }
+
+                // 如果已定制账单,并且新的销售联系人、回款联系人不一致，必须从定制账单中移除
+                if("1".equals(emisSettleSubBill.getBlMerge())){
+                    // 判断是否调整销售联系人或回款联系人，如调整，需要先从账单里移除
+
+                    String newDataStr=emisWaybillAjustApply.getJsonData();
+                    JSONObject jObj  = JSONObject.parseObject(newDataStr);
+//                    JSONObject jobjOldValue=jObj.getJSONObject("oldValue");
+                    JSONObject  jobjNewValue=jObj.getJSONObject("newValue");
+
+                    String oldPayee=emisSettleSubBill.getPayee();
+                    String oldSalesmen=emisSettleSubBill.getSalesmen();
+
+                    String newPayee=jobjNewValue.getString("payee");
+                    String newSalesmen=jobjNewValue.getString("salesmen");
+
+                    if(!oldPayee.equals(newPayee) || !oldSalesmen.equals(newSalesmen) ){
+                        throw new EmisBizError(EmisBizErrorType.FAIL,"已定制账单，销售联系/回款联系人发生改变，请从原账单移除，单号:"+emisSettleSubBill.getBillNo());
+                    }
+                }
             }
+
+
+
         }
 
         // 运单更新