1.出入库转换规则插件调整

2.付款结果反馈接口调整

lc123/cloud/app/api/controller/CasPaybillController.java

@@ -41,7 +41,7 @@ public class CasPaybillController {
             "acttradedate,feepayer,createtime,payeeacctcash,openorg,totalpayamt,payquotation,dppayquotation,agreedquotation,settletype,settletype.settlementtype,settletnumber,singlestream,basecurrency," +
             "paymentidentify,feepaydate,feepay,matchamountpay,unmatchamountpay,unmatchamountrec,matchamountrec,matchflag,bizdate,auditdate,sourcebilltype,entry,entry.e_sourcebillid,cas_draftinfo.draftbillinfo," +
             "cas_draftinfo.transamount,cas_draftinfo.draftbilllogid,entry.e_scheid,cas_draftinfo.srcbillindex,cas_draftinfo.paybillcurrency,entry.e_dpamt,tqq9_digital_receipt,tqq9_billstatus,iswaitsche,priority,changestatus," +
-            "istop,entry.e_refundamt,entry.e_remainrefundamt,totalrefundedamt,totalremainrefundamt,localrefundedamt,localremainrefundamt"; //应收结算记录
+            "istop,entry.e_refundamt,entry.e_remainrefundamt,totalrefundedamt,totalremainrefundamt,localrefundedamt,localremainrefundamt,tqq9_dzhdbh,tqq9_cwztfkzt"; //应收结算记录
     private final static Log logger = LogFactory.getLog(CasPaybillController.class);
 
     @ApiPostMapping(value = "/CasPaybill_StatusChange", desc = "付款单状态变更api接口")

lc123/cloud/app/plugin/form/pm/PurRefundApplyBillPlugin.java

@@ -47,11 +47,7 @@ public class PurRefundApplyBillPlugin extends AbstractBillPlugIn implements Befo
         super.registerListener(e);
         this.addItemClickListeners("tbmain");
         BasedataEdit tqq9_ph = this.getControl("tqq9_ph");
-//        RefBillEdit tqq9_inwarebill = this.getControl("tqq9_inwarebill");
         tqq9_ph.addBeforeF7SelectListener(this);
-//        tqq9_inwarebill.addBeforeF7SelectListener(this);
-//        this.addClickListeners("tqq9_ydthno");
-
     }
 
     @Override
@@ -66,71 +62,6 @@ public class PurRefundApplyBillPlugin extends AbstractBillPlugIn implements Befo
             SaveServiceHelper.save(new DynamicObject[]{this.getModel().getDataEntity(true)});
             this.getView().updateView();
         }
-//        else if (StringUtils.equals("pm_purrefundapplybill", actionId) && returnData != null) {
-//            int size = ((ListSelectedRowCollection) returnData).size();
-//            if(size>1){
-//                this.getView().showErrorNotification("只允许选择一行入库单");
-//                return;
-//            }
-//
-//            ListSelectedRow listSelectedRow = ((ListSelectedRowCollection) returnData).get(0);
-//            //入库单数据查询
-//            DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle(listSelectedRow.toString(), "im_purinbill");
-//            String billid = listSelectedRow.getPrimaryKeyValue().toString();//单据id
-//            String entryid = listSelectedRow.getEntryPrimaryKeyValue().toString();//分录id
-//                DynamicObjectCollection billentry = dynamicObject.getDynamicObjectCollection("billentry");
-//            for (DynamicObject object : billentry) {
-//                String id = object.getString("id");
-//                if (StringUtils.equals(id, entryid)) {
-//                    String wmsentryid = listSelectedRow.getEntryPrimaryKeyValue().toString();//WMS分录id
-//                    BigDecimal qty = object.getBigDecimal("qty");//入库数量
-//                    DynamicObject warehouse = object.getDynamicObject("warehouse");//入库仓库
-//                    Date producedate = object.getDate("producedate");//生产日期
-//                    Date expirydate = object.getDate("expirydate");//到期日期
-//                    String lotnumber = object.getString("lotnumber");//批号
-//                    String tqq9_registration = object.getString("tqq9_registration");//注册证
-//                    String tqq9_licenseno = object.getString("tqq9_licenseno");//许可证
-//                    String mainbillentryid = object.getString("mainbillentryid");
-//
-//                    //采购退货申请循环找分录
-//                    DynamicObjectCollection billentry1 = this.getModel().getDataEntity(true).getDynamicObjectCollection("billentry");
-//                    for (DynamicObject object1 : billentry1) {
-//                        String mainbillentryid1 = object1.getString("mainbillentryid");
-//                        if (StringUtils.equals(mainbillentryid, mainbillentryid1)) {
-//                            int seq = object1.getInt("seq");
-//                            this.getModel().setValue("tqq9_inwarebillid", billid, seq-1);
-//                            this.getModel().setValue("tqq9_inwarebillentryid", entryid, seq-1);
-//                            this.getModel().setValue("tqq9_wmsdetailid", wmsentryid, seq-1);
-//                            this.getModel().setValue("tqq9_maxqty", qty, seq-1);
-//                            this.getModel().setValue("tqq9_thck", warehouse, seq-1);
-//                            this.getModel().setValue("tqq9_productdate", producedate, seq-1);
-//                            this.getModel().setValue("tqq9_expiredate", expirydate, seq-1);
-//                            this.getModel().setValue("tqq9_ph", lotnumber, seq-1);
-//                            this.getModel().setValue("tqq9_registration", tqq9_registration, seq-1);
-//                            this.getModel().setValue("tqq9_licenseno", tqq9_licenseno, seq-1);
-//                            this.getView().updateView();
-//                        }
-//
-//                    }
-//                }
-//            }
-////            if (billentry.size() > rowKey) {
-////                DynamicObject dynamicObject1 = billentry.get(rowKey);
-//////                String billid = listSelectedRow.getPrimaryKeyValue().toString();//单据id
-//////                String entryid = listSelectedRow.getEntryPrimaryKeyValue().toString();//分录id
-////                String wmsentryid = listSelectedRow.getEntryPrimaryKeyValue().toString();//WMS分录id
-////                BigDecimal qty = dynamicObject1.getBigDecimal("qty");//入库数量
-////                DynamicObject warehouse = dynamicObject1.getDynamicObject("warehouse");//入库仓库
-////                Date producedate = dynamicObject1.getDate("producedate");//生产日期
-////                Date expirydate = dynamicObject1.getDate("expirydate");//到期日期
-////                String lotnumber = dynamicObject1.getString("lotnumber");//批号
-////                String tqq9_registration = dynamicObject1.getString("tqq9_registration");//注册证
-////                String tqq9_licenseno = dynamicObject1.getString("tqq9_licenseno");//许可证
-////
-////            }
-//
-//        }
-
     }
 
     /**
@@ -207,20 +138,6 @@ public class PurRefundApplyBillPlugin extends AbstractBillPlugIn implements Befo
                 }
             }
         }
-//        else if (StringUtils.equals("tqq9_inwarebill", name)) {
-//            int index = this.getModel().getEntryCurrentRowIndex("billentry");
-//            Object mainbillnumber = this.getModel().getValue("mainbillnumber", index);
-//            if (mainbillnumber != null) {
-//                ListShowParameter param = (ListShowParameter) beforeF7SelectEvent.getFormShowParameter();
-//                QFilter qF1 = new QFilter("billentry.mainbillnumber", QCP.equals, mainbillnumber.toString());
-//                qF1.and("billstatus", QCP.equals, "C");
-//                param.getListFilterParameter().getQFilters().add(qF1);
-//                param.setCustomParam("ismergerows", false);
-//                CloseCallBack closeCallBack = new CloseCallBack(this.getPluginName(), "pm_purrefundapplybill");
-//                param.setCloseCallBack(closeCallBack);
-//
-//            }
-//        }
     }
 
     @Override
@@ -251,13 +168,5 @@ public class PurRefundApplyBillPlugin extends AbstractBillPlugIn implements Befo
 
             }
         }
-//        else if (StringUtils.equals("tqq9_inwarebill", name)) {
-//            IDataModel model = this.getModel();
-//
-//            ChangeData changeData = e.getChangeSet()[0];
-//            int rowIndex = changeData.getRowIndex();
-//            DynamicObject tqq9_inwarebill = (DynamicObject) model.getValue("tqq9_inwarebill", rowIndex);//批号
-//
-//        }
     }
 }

lc123/cloud/app/plugin/operate/im/OtherInApplyPushOtherInConvertPlugin.java

@@ -78,12 +78,8 @@ public class OtherInApplyPushOtherInConvertPlugin extends AbstractConvertPlugIn
                             if (jsonMap.get("expirationDate") instanceof Long) {
                                 expirationDate = new Date((Long) jsonMap.get("expirationDate")); //生产日期
                             }
-                            BigDecimal quantity = BigDecimal.ZERO;
+                            BigDecimal quantity = new BigDecimal(jsonMap.get("quantity").toString());//入库数量
-                            if (com.alibaba.nacos.common.utils.StringUtils.equals("sm_delivernotice", VoucherType)) {
+
-                                quantity = new BigDecimal(jsonMap.get("quantity").toString());//入库数量
-                            } else {
-                                quantity = new BigDecimal(jsonMap.get("quantity").toString()).negate();//入库数量
-                            }
                             String batch = jsonMap.get("batch") != null ? jsonMap.get("batch").toString() : null; // 批次
                             String wmsDetailId = jsonMap.get("wmsDetailId") != null ? jsonMap.get("wmsDetailId").toString() : null; // WMS分录id
                             String uniqueCode = jsonMap.get("uniqueCode") != null ? jsonMap.get("uniqueCode").toString() : null; // 商品编码

lc123/cloud/app/plugin/operate/im/OtherOutApplyPushOtherOutConvertPlugin.java

@@ -38,6 +38,7 @@ public class OtherOutApplyPushOtherOutConvertPlugin extends AbstractConvertPlugI
      * registrationCode	注册证号
      * licenceCode	生产许可证号
      * producer	生产厂商
+     *
      * @param e
      */
     @Override
@@ -77,12 +78,8 @@ public class OtherOutApplyPushOtherOutConvertPlugin extends AbstractConvertPlugI
                             if (jsonMap.get("expirationDate") instanceof Long) {
                                 expirationDate = new Date((Long) jsonMap.get("expirationDate")); //生产日期
                             }
-                            BigDecimal quantity = BigDecimal.ZERO;
+                            BigDecimal quantity = new BigDecimal(jsonMap.get("quantity").toString());//入库数量
-                            if (com.alibaba.nacos.common.utils.StringUtils.equals("sm_delivernotice", VoucherType)) {
+
-                                quantity = new BigDecimal(jsonMap.get("quantity").toString());//入库数量
-                            } else {
-                                quantity = new BigDecimal(jsonMap.get("quantity").toString()).negate();//入库数量
-                            }
                             String batch = jsonMap.get("batch") != null ? jsonMap.get("batch").toString() : null; // 批次
                             String wmsDetailId = jsonMap.get("wmsDetailId") != null ? jsonMap.get("wmsDetailId").toString() : null; // WMS分录id
                             String uniqueCode = jsonMap.get("uniqueCode") != null ? jsonMap.get("uniqueCode").toString() : null; // 商品编码