销售订单单证

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

@@ -155,6 +155,12 @@ 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," +
@@ -196,7 +202,7 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
                             " 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,oe.cbdefine2,od.cInvCode" +
+                            " 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" +