推送srm调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/entity/VO/PurchasePreDeliverDetailVo.java

@@ -73,10 +73,12 @@ public class PurchasePreDeliverDetailVo {
     // 存货分类编号
     private String invccode;
     // 委外订单主表id
-    private String ompoid;
+    private String purchaseOrderId;
+    // 采购委外账套
+    private String sysOrgCode;
 
     // 面辅料合并时主键：采购委外主表ID+发货日期+存货编码
     public String toFabricUnicId(){
-        return ompoid+"-"+arriveDate+"-"+invCode;
+        return purchaseOrderId+"-"+arriveDate+"-"+invCode;
     }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/mapper/xml/SyShippingDetailsMapper.xml

@@ -371,7 +371,7 @@ ${ew.customSqlSegment}
         b.pre_delivery_date 'arriveDate',
         b.ompo_Id_Item 'purchaseId',
         c.declaration_name,c.declaration_unit,
-        b.inventory_ccode as invccode,b.ompo_id as ompoid
+        b.inventory_ccode as invccode,b.ompo_id as purchase_order_id,b.ompo_account as sys_org_code
         from sy_shipping_details a
         left join sy_shipping_details_item b
         on a.id=b.shipping_details_id

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/service/impl/SyShippingDetailsServiceImpl.java

@@ -431,6 +431,7 @@ public class SyShippingDetailsServiceImpl extends ServiceImpl<SyShippingDetailsM
                 deliverVo.setSendDate(findDetailVo.getArriveDate());
                 deliverVo.setQuantity(findDetailVo.getQuantity());
                 deliverVo.setPurchasePreDeliverDetailList(findDetailVoList);
+                deliverVo.setSysOrgCode(findDetailVo.getSysOrgCode());
                 List<PurchasePreDeliverDetailSizeVo> findDetailSizeVoList = deliverDetailSizeVoList.stream().filter(p1->p1.getSyShippingDetailGroupId().equals(findDetailVo.getSyShippingDetailGroupId())).collect(Collectors.toList());
                 findDetailVo.setPurchasePreDeliverDetailSizeList(findDetailSizeVoList);
                 deliverVoList.add(deliverVo);
@@ -477,6 +478,7 @@ public class SyShippingDetailsServiceImpl extends ServiceImpl<SyShippingDetailsM
                 deliverVo.setSendDate(findDetailVo.getArriveDate());
                 deliverVo.setPurchasePreDeliverDetailList(findDetailVoList);
                 deliverVo.setQuantity(findDetailVo.getQuantity());
+                deliverVo.setSysOrgCode(findDetailVo.getSysOrgCode());
                 deliverVoList.add(deliverVo);
 
             }