diff --git a/lc123/cloud/app/api/controller/FWBillStateUpdController.java b/lc123/cloud/app/api/controller/FWBillStateUpdController.java index a0e6014..f1441e5 100644 --- a/lc123/cloud/app/api/controller/FWBillStateUpdController.java +++ b/lc123/cloud/app/api/controller/FWBillStateUpdController.java @@ -109,10 +109,10 @@ public class FWBillStateUpdController { } else { if (state == 0) { bill.set("tqq9_issuccess", true); - bill.set("tqq9_fwstate", "C"); + bill.set("tqq9_fwstate", "已审核"); approveLog.set("tqq9_issuccess", true); } else { - bill.set("tqq9_fwstate", "D"); + bill.set("tqq9_fwstate", "驳回"); } SaveServiceHelper.save(new DynamicObject[]{bill}); //保存日志 diff --git a/lc123/cloud/app/api/controller/SupplierControl.java b/lc123/cloud/app/api/controller/SupplierControl.java index 72f80ef..fe7964c 100644 --- a/lc123/cloud/app/api/controller/SupplierControl.java +++ b/lc123/cloud/app/api/controller/SupplierControl.java @@ -219,7 +219,7 @@ public class SupplierControl implements Serializable { bd_supplier.set("tqq9_textareafield_jyfw", tqq9_textareafield_jyfw); bd_supplier.set("tqq9_zczb", tqq9_zczb); bd_supplier.set("tqq9_textfield4_zs1", tqq9_textfield4_zs1); - bd_supplier.set("tqq9_fwstate", "C"); + bd_supplier.set("tqq9_fwstate", "已审核"); bd_supplier.set("tqq9_mulcombofield1", ",A,B,C,"); DynamicObjectCollection entry_linkman1 = bd_supplier.getDynamicObjectCollection("entry_linkman"); for (SupplierModel.DataBean.LinkmanBean linkmanBean : entry_linkman) { diff --git a/lc123/cloud/app/api/plugin/FWDefaultApprovalStatusPlugin.java b/lc123/cloud/app/api/plugin/FWDefaultApprovalStatusPlugin.java index 0516807..270c26a 100644 --- a/lc123/cloud/app/api/plugin/FWDefaultApprovalStatusPlugin.java +++ b/lc123/cloud/app/api/plugin/FWDefaultApprovalStatusPlugin.java @@ -16,7 +16,7 @@ public class FWDefaultApprovalStatusPlugin extends AbstractBillPlugIn implements // //判断是否为空 // if (StringUtils.isBlank(tqq9_fwstate)) { // //设置默认值 -// this.getModel().setValue("tqq9_fwstate", "A"); +// this.getModel().setValue("tqq9_fwstate", "待提交"); // logger.info("默认值设置成功"); // } else { // logger.info("默认值已存在"); diff --git a/lc123/cloud/app/api/plugin/FWOtheroutApplySavePlugin.java b/lc123/cloud/app/api/plugin/FWOtheroutApplySavePlugin.java index a83669b..9c61931 100644 --- a/lc123/cloud/app/api/plugin/FWOtheroutApplySavePlugin.java +++ b/lc123/cloud/app/api/plugin/FWOtheroutApplySavePlugin.java @@ -88,7 +88,7 @@ public class FWOtheroutApplySavePlugin implements ApiSavePlugin { reqDatum.put("tqq9_ypzs", "MBYPLY"); } //泛微审批状体 - reqDatum.put("tqq9_fwstate", "C"); + reqDatum.put("tqq9_fwstate", "已审核"); //处理收货地址长度 String tqq9_lshxx_tag = (String) reqDatum.get("tqq9_lshxx_tag"); diff --git a/lc123/cloud/app/plugin/form/pm/PurOrderChangeBillDefaultValePlugin.java b/lc123/cloud/app/plugin/form/pm/PurOrderChangeBillDefaultValePlugin.java index 56ba2d2..fae9119 100644 --- a/lc123/cloud/app/plugin/form/pm/PurOrderChangeBillDefaultValePlugin.java +++ b/lc123/cloud/app/plugin/form/pm/PurOrderChangeBillDefaultValePlugin.java @@ -17,7 +17,7 @@ public class PurOrderChangeBillDefaultValePlugin extends AbstractBillPlugIn { super.afterBindData(e); String tqq9_fwstate = (String) this.getModel().getValue("tqq9_fwstate"); if(StringUtils.isBlank(tqq9_fwstate)){ - this.getModel().setValue("tqq9_fwstate", "A");//待提交 + this.getModel().setValue("tqq9_fwstate", "待提交");//待提交 } } } diff --git a/lc123/cloud/app/plugin/operate/cas/PayApplySubmitToFwOp.java b/lc123/cloud/app/plugin/operate/cas/PayApplySubmitToFwOp.java index 6b0ed40..a70a055 100644 --- a/lc123/cloud/app/plugin/operate/cas/PayApplySubmitToFwOp.java +++ b/lc123/cloud/app/plugin/operate/cas/PayApplySubmitToFwOp.java @@ -35,12 +35,12 @@ public class PayApplySubmitToFwOp extends AbstractOperationServicePlugIn { if(data != null){ String requestid = data.getString("requestid"); bill.set("tqq9_fwrequestid", requestid); - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } String tqq9_fwrequestid = bill.getString("tqq9_fwrequestid"); if (StringUtils.isNotBlank(tqq9_fwrequestid)) {//驳回后提交修改泛微审批状态 - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } } diff --git a/lc123/cloud/app/plugin/operate/conm/PurconmSubmitToFwOp.java b/lc123/cloud/app/plugin/operate/conm/PurconmSubmitToFwOp.java index ffbcafc..a6c2c66 100644 --- a/lc123/cloud/app/plugin/operate/conm/PurconmSubmitToFwOp.java +++ b/lc123/cloud/app/plugin/operate/conm/PurconmSubmitToFwOp.java @@ -46,12 +46,12 @@ public class PurconmSubmitToFwOp extends AbstractOperationServicePlugIn { if(data != null){ String requestid = data.getString("requestid"); bill.set("tqq9_fwrequestid", requestid); - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } String tqq9_fwrequestid = bill.getString("tqq9_fwrequestid"); if (StringUtils.isNotBlank(tqq9_fwrequestid)) {//驳回后提交修改泛微审批状态 - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } } diff --git a/lc123/cloud/app/plugin/operate/im/ImInvCountBillSubmitToFwOp.java b/lc123/cloud/app/plugin/operate/im/ImInvCountBillSubmitToFwOp.java index fca54c1..6a6f296 100644 --- a/lc123/cloud/app/plugin/operate/im/ImInvCountBillSubmitToFwOp.java +++ b/lc123/cloud/app/plugin/operate/im/ImInvCountBillSubmitToFwOp.java @@ -36,12 +36,12 @@ public class ImInvCountBillSubmitToFwOp extends AbstractOperationServicePlugIn { if (data != null) { String requestid = data.getString("requestid"); bill.set("tqq9_fwrequestid", requestid); - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } String tqq9_fwrequestid = bill.getString("tqq9_fwrequestid"); if (StringUtils.isNotBlank(tqq9_fwrequestid)) {//驳回后提交修改泛微审批状态 - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } } diff --git a/lc123/cloud/app/plugin/operate/im/OtherInApplySubmitToFwOp.java b/lc123/cloud/app/plugin/operate/im/OtherInApplySubmitToFwOp.java index f720d49..71684da 100644 --- a/lc123/cloud/app/plugin/operate/im/OtherInApplySubmitToFwOp.java +++ b/lc123/cloud/app/plugin/operate/im/OtherInApplySubmitToFwOp.java @@ -41,12 +41,12 @@ public class OtherInApplySubmitToFwOp extends AbstractOperationServicePlugIn { if (data != null) { String requestid = data.getString("requestid"); bill.set("tqq9_fwrequestid", requestid); - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } String tqq9_fwrequestid = bill.getString("tqq9_fwrequestid"); if (StringUtils.isNotBlank(tqq9_fwrequestid)) {//驳回后提交修改泛微审批状态 - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } } diff --git a/lc123/cloud/app/plugin/operate/im/OtherInSubmitToFwOp.java b/lc123/cloud/app/plugin/operate/im/OtherInSubmitToFwOp.java index 7960437..e3a5849 100644 --- a/lc123/cloud/app/plugin/operate/im/OtherInSubmitToFwOp.java +++ b/lc123/cloud/app/plugin/operate/im/OtherInSubmitToFwOp.java @@ -42,12 +42,12 @@ public class OtherInSubmitToFwOp extends AbstractOperationServicePlugIn { if (data != null) { String requestid = data.getString("requestid"); bill.set("tqq9_fwrequestid", requestid); - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } String tqq9_fwrequestid = bill.getString("tqq9_fwrequestid"); if (StringUtils.isNotBlank(tqq9_fwrequestid)) {//驳回后提交修改泛微审批状态 - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } } diff --git a/lc123/cloud/app/plugin/operate/im/OtherOutApplySubmitToFwOp.java b/lc123/cloud/app/plugin/operate/im/OtherOutApplySubmitToFwOp.java index 84e4757..748dc53 100644 --- a/lc123/cloud/app/plugin/operate/im/OtherOutApplySubmitToFwOp.java +++ b/lc123/cloud/app/plugin/operate/im/OtherOutApplySubmitToFwOp.java @@ -42,12 +42,12 @@ public class OtherOutApplySubmitToFwOp extends AbstractOperationServicePlugIn { if(data != null){ String requestid = data.getString("requestid"); bill.set("tqq9_fwrequestid", requestid); - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } String tqq9_fwrequestid = bill.getString("tqq9_fwrequestid"); if (StringUtils.isNotBlank(tqq9_fwrequestid)) {//驳回后提交修改泛微审批状态 - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } } diff --git a/lc123/cloud/app/plugin/operate/im/OtherOutSubmitToFwOp.java b/lc123/cloud/app/plugin/operate/im/OtherOutSubmitToFwOp.java index ccc4416..5309010 100644 --- a/lc123/cloud/app/plugin/operate/im/OtherOutSubmitToFwOp.java +++ b/lc123/cloud/app/plugin/operate/im/OtherOutSubmitToFwOp.java @@ -43,12 +43,12 @@ public class OtherOutSubmitToFwOp extends AbstractOperationServicePlugIn { if(data != null){ String requestid = data.getString("requestid"); bill.set("tqq9_fwrequestid", requestid); - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } String tqq9_fwrequestid = bill.getString("tqq9_fwrequestid"); if (StringUtils.isNotBlank(tqq9_fwrequestid)) {//驳回后提交修改泛微审批状态 - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } } diff --git a/lc123/cloud/app/plugin/operate/im/ShortageBillSubmitToFwOp.java b/lc123/cloud/app/plugin/operate/im/ShortageBillSubmitToFwOp.java index f4d0d1b..c2c252a 100644 --- a/lc123/cloud/app/plugin/operate/im/ShortageBillSubmitToFwOp.java +++ b/lc123/cloud/app/plugin/operate/im/ShortageBillSubmitToFwOp.java @@ -32,12 +32,12 @@ public class ShortageBillSubmitToFwOp extends AbstractOperationServicePlugIn imp if(data != null){ String requestid = data.getString("requestid"); bill.set("tqq9_fwrequestid", requestid); - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } String tqq9_fwrequestid = bill.getString("tqq9_fwrequestid"); if (StringUtils.isNotBlank(tqq9_fwrequestid)) {//驳回后提交修改泛微审批状态 - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } } diff --git a/lc123/cloud/app/plugin/operate/pm/PurApplySubmitToFwPlugin.java b/lc123/cloud/app/plugin/operate/pm/PurApplySubmitToFwPlugin.java index 4edca22..be9921f 100644 --- a/lc123/cloud/app/plugin/operate/pm/PurApplySubmitToFwPlugin.java +++ b/lc123/cloud/app/plugin/operate/pm/PurApplySubmitToFwPlugin.java @@ -35,12 +35,12 @@ public class PurApplySubmitToFwPlugin extends AbstractOperationServicePlugIn { if(data != null){ String requestid = data.getString("requestid"); bill.set("tqq9_fwrequestid", requestid); - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } String tqq9_fwrequestid = bill.getString("tqq9_fwrequestid"); if (StringUtils.isNotBlank(tqq9_fwrequestid)) {//驳回后提交修改泛微审批状态 - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } } diff --git a/lc123/cloud/app/plugin/operate/pm/PurOrderSubmitOp.java b/lc123/cloud/app/plugin/operate/pm/PurOrderSubmitOp.java index 7f7b0cc..db81c13 100644 --- a/lc123/cloud/app/plugin/operate/pm/PurOrderSubmitOp.java +++ b/lc123/cloud/app/plugin/operate/pm/PurOrderSubmitOp.java @@ -53,12 +53,12 @@ public class PurOrderSubmitOp extends AbstractOperationServicePlugIn { if(data != null){ String requestid = data.getString("requestid"); bill.set("tqq9_fwrequestid", requestid); - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } String tqq9_fwrequestid = bill.getString("tqq9_fwrequestid"); if (StringUtils.isNotBlank(tqq9_fwrequestid)) {//驳回后提交修改泛微审批状态 - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } } diff --git a/lc123/cloud/app/plugin/operate/pm/PurrefundApplySubmitToFwOp.java b/lc123/cloud/app/plugin/operate/pm/PurrefundApplySubmitToFwOp.java index 8952a3f..1b85bdb 100644 --- a/lc123/cloud/app/plugin/operate/pm/PurrefundApplySubmitToFwOp.java +++ b/lc123/cloud/app/plugin/operate/pm/PurrefundApplySubmitToFwOp.java @@ -34,12 +34,12 @@ public class PurrefundApplySubmitToFwOp extends AbstractOperationServicePlugIn { if(data != null){ String requestid = data.getString("requestid"); bill.set("tqq9_fwrequestid", requestid); - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } String tqq9_fwrequestid = bill.getString("tqq9_fwrequestid"); if (StringUtils.isNotBlank(tqq9_fwrequestid)) {//驳回后提交修改泛微审批状态 - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } } diff --git a/lc123/cloud/app/plugin/operate/sys/MaterialSubmitToFwOp.java b/lc123/cloud/app/plugin/operate/sys/MaterialSubmitToFwOp.java index b3994a1..138cc81 100644 --- a/lc123/cloud/app/plugin/operate/sys/MaterialSubmitToFwOp.java +++ b/lc123/cloud/app/plugin/operate/sys/MaterialSubmitToFwOp.java @@ -46,12 +46,12 @@ public class MaterialSubmitToFwOp extends AbstractOperationServicePlugIn { }else{ bill.set("tqq9_fwrequestid", requestid); } - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } String tqq9_fwrequestid = bill.getString("tqq9_fwrequestid"); if (StringUtils.isNotBlank(tqq9_fwrequestid)) {//驳回后提交修改泛微审批状态 - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } } diff --git a/lc123/cloud/app/plugin/operate/sys/SupplierSubmitToFwOp.java b/lc123/cloud/app/plugin/operate/sys/SupplierSubmitToFwOp.java index 28719fc..d9584c5 100644 --- a/lc123/cloud/app/plugin/operate/sys/SupplierSubmitToFwOp.java +++ b/lc123/cloud/app/plugin/operate/sys/SupplierSubmitToFwOp.java @@ -46,12 +46,12 @@ public class SupplierSubmitToFwOp extends AbstractOperationServicePlugIn { } else { bill.set("tqq9_fwrequestid", requestid); } - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } String tqq9_fwrequestid = bill.getString("tqq9_fwrequestid"); if (StringUtils.isNotBlank(tqq9_fwrequestid)) {//驳回后提交修改泛微审批状态 - bill.set("tqq9_fwstate", "B"); + bill.set("tqq9_fwstate", "待审核"); SaveServiceHelper.save(new DynamicObject[]{bill}); } } diff --git a/lc123/cloud/app/plugin/trd/FWImpl.java b/lc123/cloud/app/plugin/trd/FWImpl.java index 54b8913..7d551e6 100644 --- a/lc123/cloud/app/plugin/trd/FWImpl.java +++ b/lc123/cloud/app/plugin/trd/FWImpl.java @@ -6285,11 +6285,11 @@ public class FWImpl { } String ccystj = null; String tqq9_ccystj = bill.getString("tqq9_ccystj"); - if ("0".equals(tqq9_ccystj)) { + if ("常温存储".equals(tqq9_ccystj)) { ccystj = "0"; - } else if ("3".equals(tqq9_ccystj)) { + } else if ("阴凉存储".equals(tqq9_ccystj)) { ccystj = "1"; - } else if ("1".equals(tqq9_ccystj)) { + } else if ("冷藏存储".equals(tqq9_ccystj)) { ccystj = "2"; } BigDecimal xxs = null; @@ -6315,29 +6315,29 @@ public class FWImpl { } String ylpfzlpczlp = null; String tqq9_combofield_spflii = bill.getString("tqq9_combofield_spflii"); - if ("ylp".equals(tqq9_combofield_spflii)) { + if ("引流品".equals(tqq9_combofield_spflii)) { ylpfzlpczlp = "0"; - } else if ("fzlp".equals(tqq9_combofield_spflii)) { + } else if ("非主流品".equals(tqq9_combofield_spflii)) { ylpfzlpczlp = "1"; - } else if ("czlp".equals(tqq9_combofield_spflii)) { + } else if ("次主流品".equals(tqq9_combofield_spflii)) { ylpfzlpczlp = "2"; } String djtp = null; String tqq9_combofield_spfliii = bill.getString("tqq9_combofield_spfliii"); - if ("dj".equals(tqq9_combofield_spfliii)) { + if ("独家".equals(tqq9_combofield_spfliii)) { djtp = "0"; - } else if ("tp".equals(tqq9_combofield_spfliii)) { + } else if ("贴牌".equals(tqq9_combofield_spfliii)) { djtp = "1"; } String spytfl = null; String tqq9_spfliii = bill.getString("tqq9_spfliii"); - if ("lp".equals(tqq9_spfliii)) { + if ("礼品".equals(tqq9_spfliii)) { spytfl = "0"; - } else if ("zp".equals(tqq9_spfliii)) { + } else if ("赠品".equals(tqq9_spfliii)) { spytfl = "1"; - } else if ("hc".equals(tqq9_spfliii)) { + } else if ("耗材".equals(tqq9_spfliii)) { spytfl = "2"; - } else if ("sb".equals(tqq9_spfliii)) { + } else if ("设备".equals(tqq9_spfliii)) { spytfl = "3"; } String wllx = null;