gongdoudou
/
lc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
pan-houxiang 2025-12-16 15:39:27 +08:00
parent 6059f6c430 415840771a
commit 050eb26a25
19 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lc123/cloud/app/api/controller/FWBillStateUpdController.java
View File

@ -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});
//保存日志

2
lc123/cloud/app/api/controller/SupplierControl.java
View File

@ -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) {

2
lc123/cloud/app/api/plugin/FWDefaultApprovalStatusPlugin.java
View File

@ -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("默认值已存在");

2
lc123/cloud/app/api/plugin/FWOtheroutApplySavePlugin.java
View File

@ -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");

2
lc123/cloud/app/plugin/form/pm/PurOrderChangeBillDefaultValePlugin.java
View File

@ -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", "待提交");//待提交
}
}
}

4
lc123/cloud/app/plugin/operate/cas/PayApplySubmitToFwOp.java
View File

@ -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});
}
}

4
lc123/cloud/app/plugin/operate/conm/PurconmSubmitToFwOp.java
View File

@ -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});
}
}

4
lc123/cloud/app/plugin/operate/im/ImInvCountBillSubmitToFwOp.java
View File

@ -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});
}
}

4
lc123/cloud/app/plugin/operate/im/OtherInApplySubmitToFwOp.java
View File

@ -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});
}
}

4
lc123/cloud/app/plugin/operate/im/OtherInSubmitToFwOp.java
View File

@ -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});
}
}

4
lc123/cloud/app/plugin/operate/im/OtherOutApplySubmitToFwOp.java
View File

@ -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});
}
}

4
lc123/cloud/app/plugin/operate/im/OtherOutSubmitToFwOp.java
View File

@ -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});
}
}

4
lc123/cloud/app/plugin/operate/im/ShortageBillSubmitToFwOp.java
View File

@ -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});
}
}

4
lc123/cloud/app/plugin/operate/pm/PurApplySubmitToFwPlugin.java
View File

@ -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});
}
}

4
lc123/cloud/app/plugin/operate/pm/PurOrderSubmitOp.java
View File

@ -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});
}
}

4
lc123/cloud/app/plugin/operate/pm/PurrefundApplySubmitToFwOp.java
View File

@ -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});
}
}

4
lc123/cloud/app/plugin/operate/sys/MaterialSubmitToFwOp.java
View File

@ -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});
}
}

4
lc123/cloud/app/plugin/operate/sys/SupplierSubmitToFwOp.java
View File

@ -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});
}
}

24
lc123/cloud/app/plugin/trd/FWImpl.java
View File

@ -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;