发运明细

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -825,8 +825,13 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 				 //查询最底层订单供应商
 				SyOrderDataVO entity = syGetOrderService.queryOrder(li.getSyOrderDataItemId());
 				 if(oConvertUtils.isNotEmpty(entity)){
-					 li.setSupplierCode(entity.getSupplierCode());
-					 li.setSupplier(entity.getSupplier());
+					 li.setSupplierCode(entity.getSupplierCode());//供应商编码
+					 li.setSupplier(entity.getSupplier());//供应商名称
+					 li.setOmpoId(entity.getOmpoId());//委外采购Id 主
+					 li.setOmpoIdItem(entity.getOmpoIdItem());//委外采购Id 子表
+					 li.setOmpoAccount(entity.getOmpoAccount());//供应商账套
+					 li.setPurOrSubOrder(entity.getOmpoCode());//委外采购订单号
+					 li.setYmoney(entity.getYmoney());//佣金
 				 }
 			 }
 			 m++;

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

@@ -350,4 +350,14 @@ public class SyShippingDetailsItem {
 	@Excel(name = "最底层供应商名称", width = 15)
 	@ApiModelProperty(value = "最底层供应商名称")
 	private java.lang.String supplier;
+
+	//采购委外账套号
+	private java.lang.String ompoAccount;
+
+	//委外采购Id 主
+	private java.lang.String ompoId;
+	//委外采购Id 子
+	private java.lang.String ompoIdItem;
+	//佣金
+	private java.math.BigDecimal ymoney;
 }

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

@@ -224,9 +224,18 @@ public class OrderDataVo {
 
     @Excel(name = "委外采购订单号", width = 15)
     @ApiModelProperty(value = "委外采购订单号")
-    private String OMPOId;
+    private String purOrSubOrder;
 
     @Excel(name = "区分成衣跟面辅料", width = 15)
     @ApiModelProperty(value = "区分成衣跟面辅料")
     private String inventoryCcode;
+
+    //采购委外账套号
+    private java.lang.String ompoAccount;
+
+    //委外采购Id 主
+    private java.lang.String ompoId;
+    //委外采购Id 子
+    private java.lang.String ompoIdItem;
+
 }

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

@@ -106,7 +106,7 @@ public class SyShippingDetailsServiceImpl extends ServiceImpl<SyShippingDetailsM
                  //获取报关要素ID
                  //根据条件查询报关要素信息
               QueryWrapper<SyDeclarationElements> elementsQueryWrapper = new QueryWrapper<>();
-                 elementsQueryWrapper.eq("inventory_name",li.getInventoryName()).eq("ac_set_no",li.getAccount()).eq("item_number",li.getItemNumber()).eq("del_flag",0);
+                 elementsQueryWrapper.eq("inventory_name",li.getInventoryName()).eq("ac_set_no",li.getOmpoAccount()).eq("item_number",li.getItemNumber()).eq("del_flag",0);
                  elementsQueryWrapper.orderByDesc("create_time");
                  List<SyDeclarationElements> elementsList = syDeclarationElementsService.list(elementsQueryWrapper);
                  if(elementsList.size() != 0){