供应商

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

@@ -20,6 +20,9 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.vo.LoginUser;
 //import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.documents.orderData.entity.SyOrderDataVO;
+import org.jeecg.modules.documents.orderData.service.ISyGetOrderService;
+import org.jeecg.modules.documents.orderData.service.impl.SyGetOrderServiceImpl;
 import org.jeecg.modules.documents.seclarationElements.entity.SyDeclarationElements;
 import org.jeecg.modules.documents.seclarationElements.entity.SyDeclarationElementsItem;
 import org.jeecg.modules.documents.seclarationElements.service.ISyDeclarationElementsItemService;
@@ -87,6 +90,8 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	private ISyDeclarationElementsItemService syDeclarationElementsItemService;
 	 @Resource
 	 private SyShippingDetailsMapper syShippingDetailsMapper;
+	 @Autowired
+	 private SyGetOrderServiceImpl syGetOrderService;
 	
 	/**
 	 * 分页列表查询
@@ -817,6 +822,12 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 				 if(ids.contains(li.getSyOrderDataItemId())){
 					 li.setGroupId(groupIdList.get(m));
 				 }
+				 //查询最底层订单供应商
+				SyOrderDataVO entity = syGetOrderService.queryOrder(li.getSyOrderDataItemId());
+				 if(oConvertUtils.isNotEmpty(entity)){
+					 li.setSupplierCode(entity.getSupplierCode());
+					 li.setSupplier(entity.getSupplier());
+				 }
 			 }
 			 m++;
 		 }

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

@@ -342,4 +342,12 @@ public class SyShippingDetailsItem {
 	@Excel(name = "报关要素主表ID", width = 15)
 	@ApiModelProperty(value = "报关要素主表ID")
 	private String elementsId;
+
+	@Excel(name = "最底层供应商编码", width = 15)
+	@ApiModelProperty(value = "最底层供应商编码")
+	private java.lang.String supplierCode;
+
+	@Excel(name = "最底层供应商名称", width = 15)
+	@ApiModelProperty(value = "最底层供应商名称")
+	private java.lang.String supplier;
 }