销售订单单证同步 佣金

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/service/impl/SyOrderDataServiceImpl.java

@@ -155,12 +155,6 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
             for (JSONObject jsonObject:jian) {
                 SyOrderData sy = JSONObject.toJavaObject(jsonObject,SyOrderData.class);
                 String ID = sy.getId();
-//                String cbdefine2 = "";
-//                if(sy.getAccount().equals("902")){
-//                    cbdefine2 = "";
-//                }else {
-//                    cbdefine2 = "oe.cbdefine2";
-//                }
                 String sql = "SELECT " +
                         "s.AutoID AS id," +
                         "s.ID AS syOrderDataId," +
@@ -186,29 +180,13 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
                         "s.cMemo AS remarks ," +
                         "d.cComUnitName as masterMetering," +
                         "c.cInvStd as specificationAndModel," +
-                        "s.cSCloser as bankClosedBy" +
-//                        "p.OMPO_Id as ompoId," +
-//                        "p.cVenCode as supplierCode," +
-//                        "v.cVenAbbName as supplier,"+
-//                        "p.iTaxPrice as iTaxPrice," +
-//                        "p.cbdefine2 as ymoney"+
+                        "s.cSCloser as bankClosedBy," +
+                        "be.cbdefine2 as ymoney"+
                         " FROM" +
                         " SO_SODetails s" +
                         " left join Inventory c on c.cInvCode=s.cInvCode" +
                         " left join ComputationUnit d on d.cComunitCode=c.cComUnitCode"+
-//                        " left join (" +
-//                            " SELECT pm.cPOID as OMPO_Id,cVenCode,pd.iTaxPrice,pd.iorderdid,pe.cbdefine2,pd.cInvCode" +
-//                            " FROM PO_Pomain pm " +
-//                            " LEFT JOIN  PO_Podetails pd on pm.POID=pd.POID" +
-//                            " LEFT JOIN  PO_Podetails_extradefine pe on pd.id=pe.id" +
-//                            " where pm.cState = 1" +
-//                            " UNION" +
-//                            " SELECT om.cCode as OMPO_Id,om.cVenCode,od.iTaxPrice,od.isosid as iorderdid,"+cbdefine2+",od.cInvCode" +
-//                            " FROM OM_MOMain om " +
-//                            " LEFT JOIN  OM_MODetails  od on om.MOID =od.MOID" +
-//                            " LEFT JOIN  OM_MODetails_extradefine oe on od.MODetailsID=oe.MODetailsID" +
-//                        " ) p " +"on s.isosid  = p.iorderdid and s.cInvCode = p.cInvCode"+
-//                        " left join Vendor v on p.cVenCode=v.cVenCode"+
+                        " left join SO_SODetails_extradefine be on be.iSOsID=s.iSOsID"+
                         " where s.ID = "+ID;
                 List<Map<String, Object>> listSon = new ArrayList<>();
                 if(sy.getAccount().equals("901")){