diff --git a/lc123/cloud/app/plugin/operate/im/OtherOutSubmitToFwOp.java b/lc123/cloud/app/plugin/operate/im/OtherOutSubmitToFwOp.java index ccc4416..8d40d10 100644 --- a/lc123/cloud/app/plugin/operate/im/OtherOutSubmitToFwOp.java +++ b/lc123/cloud/app/plugin/operate/im/OtherOutSubmitToFwOp.java @@ -30,7 +30,7 @@ public class OtherOutSubmitToFwOp extends AbstractOperationServicePlugIn { if(tqq9_biztype != null){ //推泛微盘亏 String biztypenumber = tqq9_biztype.getString("number"); - if("351".equals(biztypenumber)){ + if(!"351".equals(biztypenumber)){ continue; } } diff --git a/lc123/cloud/app/plugin/trd/FWImpl.java b/lc123/cloud/app/plugin/trd/FWImpl.java index e77c7f7..cdb541d 100644 --- a/lc123/cloud/app/plugin/trd/FWImpl.java +++ b/lc123/cloud/app/plugin/trd/FWImpl.java @@ -1603,7 +1603,7 @@ public class FWImpl { e4.put("fieldValue", jldw); JSONObject e5 = new JSONObject(); e5.put("fieldName", "sl"); - e5.put("fieldValue", sl); + e5.put("fieldValue", sl!=null&&sl.compareTo(BigDecimal.ZERO)!=0?sl:0); JSONObject e6 = new JSONObject(); e6.put("fieldName", "bhsdj"); e6.put("fieldValue", bhsdj != null && bhsdj.compareTo(BigDecimal.ZERO) != 0 ? bhsdj : 0); @@ -1970,7 +1970,7 @@ public class FWImpl { jldw = unit.getString("name"); } BigDecimal sl = billentry.getBigDecimal("qty"); - BigDecimal bhsdj = billentry.getBigDecimal("qty"); + BigDecimal bhsdj = billentry.getBigDecimal("price"); BigDecimal je = billentry.getBigDecimal("amount"); int sfzp = 1; boolean ispresent = billentry.getBoolean("ispresent"); @@ -1995,13 +1995,13 @@ public class FWImpl { e4.put("fieldValue", jldw); JSONObject e5 = new JSONObject(); e5.put("fieldName", "sl"); - e5.put("fieldValue", sl); + e5.put("fieldValue", sl!=null&&sl.compareTo(BigDecimal.ZERO)!=0?sl:0); JSONObject e6 = new JSONObject(); e6.put("fieldName", "bhsdj"); - e6.put("fieldValue", bhsdj); + e6.put("fieldValue", bhsdj!=null&&bhsdj.compareTo(BigDecimal.ZERO)!=0?bhsdj:0); JSONObject e7 = new JSONObject(); e7.put("fieldName", "je"); - e7.put("fieldValue", je); + e7.put("fieldValue", je!=null&&je.compareTo(BigDecimal.ZERO)!=0?je:0); JSONObject e15 = new JSONObject(); e15.put("fieldName", "sfzp"); e15.put("fieldValue", sfzp); @@ -2019,7 +2019,7 @@ public class FWImpl { //入库仓库 DynamicObject warehouse = billentry.getDynamicObject("warehouse"); if(warehouse != null){ - rkck = warehouse.getString("number")+"<>"+deptNumber; + rkck = warehouse.getString("number")+"_"+orgNumber; } } detail1.put("tableDBName", "formtable_main_110_dt2"); @@ -2072,7 +2072,7 @@ public class FWImpl { m16.put("fieldValue", sqyybz); JSONObject m17 = new JSONObject(); m17.put("fieldName", "hzje"); - m17.put("fieldValue", hzje); + m17.put("fieldValue", hzje!=null&&hzje.compareTo(BigDecimal.ZERO)!=0?hzje:0); JSONObject m18 = new JSONObject(); m18.put("fieldName", "shdh"); m18.put("fieldValue", shdh); @@ -2277,7 +2277,7 @@ public class FWImpl { jldw = unit.getString("name"); } BigDecimal sl = billentry.getBigDecimal("qty"); - BigDecimal bhsdj = billentry.getBigDecimal("qty"); + BigDecimal bhsdj = billentry.getBigDecimal("price"); BigDecimal je = billentry.getBigDecimal("amount"); String scrq = null; Date producedate = billentry.getDate("producedate"); @@ -2318,13 +2318,13 @@ public class FWImpl { e4.put("fieldValue", jldw); JSONObject e5 = new JSONObject(); e5.put("fieldName", "sl"); - e5.put("fieldValue", sl); + e5.put("fieldValue", sl!=null&&sl.compareTo(BigDecimal.ZERO)!=0?sl:0); JSONObject e6 = new JSONObject(); e6.put("fieldName", "bhsdj"); - e6.put("fieldValue", bhsdj); + e6.put("fieldValue", bhsdj!=null&&bhsdj.compareTo(BigDecimal.ZERO)!=0?bhsdj:0); JSONObject e7 = new JSONObject(); e7.put("fieldName", "je"); - e7.put("fieldValue", je); + e7.put("fieldValue", je!=null&&je.compareTo(BigDecimal.ZERO)!=0?je:0); JSONObject e8 = new JSONObject(); e8.put("fieldName", "scrq"); e8.put("fieldValue", scrq); @@ -2356,7 +2356,7 @@ public class FWImpl { //出库仓库 DynamicObject warehouse = billentry.getDynamicObject("warehouse"); if(warehouse != null){ - ckck = warehouse.getString("number")+"<>"+deptNumber; + ckck = warehouse.getString("number")+"_"+orgNumber; } } detail1.put("tableDBName", "formtable_main_110_dt1"); @@ -2412,7 +2412,7 @@ public class FWImpl { m16.put("fieldValue", sqyybz); JSONObject m17 = new JSONObject(); m17.put("fieldName", "hzje"); - m17.put("fieldValue", hzje); + m17.put("fieldValue", hzje!=null&&hzje.compareTo(BigDecimal.ZERO)!=0?hzje:0); JSONObject m18 = new JSONObject(); m18.put("fieldName", "shdh"); m18.put("fieldValue", shdh); @@ -6384,19 +6384,19 @@ public class FWImpl { String ybbm = bill.getString("tqq9_ybbm"); String lsm = bill.getString("tqq9_lsm"); String uidm = bill.getString("tqq9_udi"); - String cd = null; + String cd = ""; DynamicObject tqq9_wlcd1 = bill.getDynamicObject("tqq9_wlcd1"); if (tqq9_wlcd1 != null) { cd = tqq9_wlcd1.getString("name"); } String cjbm = bill.getString("tqq9_cjbm"); String scxkzh = bill.getString("tqq9_scxkzh"); - String scxkzgqr = null; + String scxkzgqr = ""; Date tqq9_datefield = bill.getDate("tqq9_datefield"); if (tqq9_datefield != null) { scxkzgqr = sdf.format(tqq9_datefield); } - String sccs = null; + String sccs = ""; DynamicObject tqq9_sccs = bill.getDynamicObject("tqq9_sccs"); if (tqq9_sccs != null) { sccs = tqq9_sccs.getString("name"); @@ -6583,8 +6583,8 @@ public class FWImpl { requestid = bill.getString("tqq9_fwupdid"); JSONObject m_bgyy = new JSONObject(); - m53.put("fieldName", "bgyy"); - m53.put("fieldValue", bgyy); + m_bgyy.put("fieldName", "bgyy"); + m_bgyy.put("fieldValue", bgyy); mlist.add(m_bgyy); JSONObject detail_change = new JSONObject();