添加字段

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -17,7 +17,9 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem;
+import org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetailsItem;
 import org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo;
+import org.jeecg.modules.documents.shippingDetails.service.impl.SyShippingDetailsItemServiceImpl;
 import org.jeecg.modules.openApi.entity.DxpDataPlan;
 import org.jeecg.modules.openApi.service.IDxpDataPlanService;
 import org.jeecg.modules.spapl.vo.PackingHeaderVo;
@@ -818,4 +820,11 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 		return dateNo;
 	 }
 
+	@AutoLog(value = "给所有的数据添加客户简称")
+	@ApiOperation(value="给所有的数据添加客户简称", notes="给所有的数据添加客户简称")
+	@GetMapping(value = "/updateShipping")
+	public String updateShipping(){
+		syPreAssembledPackingListService.updateShipping();
+		return "true";
+	}
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/entity/SyPreAssembledPackingList.java

@@ -192,6 +192,9 @@ public class SyPreAssembledPackingList implements Serializable {
 	@ApiModelProperty(value = "是否被参照(0:无,1:被预托书参照,2:被装箱单参照)")
 	private Integer isReference;
 
+	//委外采购Id 主
+	private java.lang.String ompoId;
+
 	//子表集合
 	@TableField(exist = false)
 	@ApiModelProperty(value = "子表集合")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/entity/SyPreAssembledPackingListItem.java

@@ -245,4 +245,21 @@ public class SyPreAssembledPackingListItem implements Serializable {
 	@ApiModelProperty(value = "是否新增")
 	private int isAdd;
 
+	@Excel(name = "最底层供应商编码", width = 15)
+	@ApiModelProperty(value = "最底层供应商编码")
+	private java.lang.String supplierCode;
+
+	@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/spapl/mapper/xml/SyPreAssembledPackingListItemMapper.xml

@@ -45,6 +45,12 @@
 			sum(total_price) total_price,/*总价*/
 			with_code,
 			small_po,
+        	supplier_Code,/*最底层供应商编码*/
+			supplier,/*最底层供应商名称*/
+			ompo_account,/*采购委外账套号*/
+			ompo_Id,/*委外采购主表Id*/
+			ompo_Id_Item,/*委外采购子表Id*/
+			ymoney,/*佣金*/
 			inventory_name,
 			inventory_code,
 			spur_or_sub_order,
@@ -90,6 +96,12 @@
             SUM(sy_shipping_details_item.shipment_Quantity)/sy_order_data_item.box_Number piecesBox,/*每箱件数*/
             sy_order_data_item.box_Number boxNumber,/*箱数*/
         	sy_shipping_details_item.group_id as group_id,/*分组id*/
+        	sy_shipping_details_item.supplier_Code,/*最底层供应商编码*/
+			sy_shipping_details_item.supplier,/*最底层供应商名称*/
+			sy_shipping_details_item.ompo_account,/*采购委外账套号*/
+			sy_shipping_details_item.ompo_Id,/*委外采购主表Id*/
+			sy_shipping_details_item.ompo_Id_Item,/*委外采购子表Id*/
+			sy_shipping_details_item.ymoney,/*佣金*/
             sy_shipping_details_item.pur_Or_Sub_Order  spurOrSubOrder/*采购/委外订单号 s*/
 		 FROM sy_shipping_details
 		 LEFT JOIN sy_shipping_details_item
@@ -168,7 +180,7 @@
 	<select id="pushData" resultType="org.jeecg.modules.spapl.vo.PackingLineVo" parameterType="java.lang.String">
         SELECT
 			sort AS packingLineNum/*排序*/,
-			sy_order_data_item_id AS attributeBigint1,/*采购/委外订单行号ID（子表唯一标识）*/
+			ompo_Id_Item AS attributeBigint1,/*采购/委外订单行号ID（子表唯一标识）*/
 			style_No AS styleNo/*styleNo*/,
 			item_Code AS featureCode1/*ITEM NO./SKU NO./UPC NO./PACKS CODE*/,
 			prepack_Sku AS prepackSku/*PREPACK_SKU*/,

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/xml/SyPreAssembledPackingListMapper.xml

@@ -13,7 +13,9 @@
 /*        sy_shipping_details.chinese_Name AS productName,中文品名-->品名
         sy_shipping_details.english_product_name,英文品名*/
         sy_shipping_details.customer AS customer, /*客户 customer */
-        sy_order_data.customer_Abbreviation AS customerAbbreviation, /*客户简称 customer */
+        /* sy_order_data.customer_Abbreviation AS customerAbbreviation,客户简称 customer */
+        (SELECT sy_shipping_details_item.`customer_Abbreviation` FROM sy_shipping_details_item
+        WHERE shipping_details_id=sy_shipping_details.id LIMIT 1) customer_Abbreviation,/*客户简称*/
         sy_order_data.customer_Code AS customerCode, /*客户编码 customer */
         sy_order_data.business_Type_Value,/*业务类型*/
         sy_order_data.salesman,/*业务员*/
@@ -23,6 +25,8 @@
         sy_shipping_details.order_Type AS  orderType, /*订单类型 m*/
         (SELECT sy_shipping_details_item.`pur_or_sub_order` FROM sy_shipping_details_item
         WHERE shipping_details_id=sy_shipping_details.id LIMIT 1) spur_Or_Sub_Order,/*采购/委外订单号*/
+        (SELECT sy_shipping_details_item.`ompo_Id` FROM sy_shipping_details_item
+        WHERE shipping_details_id=sy_shipping_details.id LIMIT 1) ompo_Id,/*采购/委外订单id*/
         (SELECT sy_shipping_details_item.`elements_id` FROM sy_shipping_details_item
         WHERE shipping_details_id=sy_shipping_details.id LIMIT 1) elements_id /*申报要素ID*/
     FROM sy_shipping_details
@@ -39,8 +43,8 @@
         a.document_No,/*单据号*/
         a.order_number,/*订单号*/
         a.item_number, /*款号*/
-	    (SELECT english_product_name FROM  sy_declaration_elements WHERE id=a.elements_id) productName,/*中文品名*/
-	    (SELECT declaration_name FROM  sy_declaration_elements WHERE id=a.elements_id) english_product_name,/*英文品名*/
+	    (SELECT english_product_name FROM  sy_declaration_elements WHERE id=a.elements_id) english_product_name ,/*中文品名*/
+	    (SELECT declaration_name FROM  sy_declaration_elements WHERE id=a.elements_id) productName,/*英文品名*/
         a.size_range,/*尺码范围*/
         a.customer,/*客户名称*/
         a.container_code,/*集装箱号*/
@@ -85,7 +89,7 @@
     SELECT
         document_No AS packingHeaderNum/*单据号*/,
         spur_Or_Sub_Order AS poNo,/*委外/采购订单号*/
-        sy_order_data_id AS attributeBigint1,/*采购/委外订单号对应的ID（唯一标识）*/
+        ompo_Id AS attributeBigint1,/*采购/委外订单号对应的ID（唯一标识）*/
         'CLOTHING' AS packingType /*计划装箱单类型*/,
         'NEW' AS packingStatus /*计划装箱单头状态*/,
         size_Range  AS size_Range,/*尺寸范围*/
@@ -102,7 +106,7 @@
         SELECT
         document_No AS packingHeaderNum/*单据号*/,
         spur_Or_Sub_Order AS poNo,/*委外/采购订单号*/
-        sy_order_data_id AS attributeBigint1,/*采购/委外订单号对应的ID（唯一标识）*/
+        ompo_Id AS attributeBigint1,/*采购/委外订单号对应的ID（唯一标识）*/
         'CLOTHING' AS packingType /*计划装箱单类型*/,
         'NEW' AS packingStatus /*计划装箱单头状态*/,
         size_Range  AS size_Range,/*尺寸范围*/

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/ISyPreAssembledPackingListService.java

@@ -95,4 +95,5 @@ public interface ISyPreAssembledPackingListService extends IService<SyPreAssembl
 	 */
 	public String submitBatch(String [] ids);
 
+	public String updateShipping();
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListServiceImpl.java

@@ -80,6 +80,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				item1.setId(oConvertUtils.id());//获取到随机id
 				//获取发育明细数据
 				SyShippingDetailsItem syItem=syShippingDetailsItemMapper.selectById(item1.getSyDeclarationElementsItemId());
+				item1.setOmpoIdItem(syItem.getOmpoIdItem());//获取委外/采购订单子表Id
 				item1.setSyOrderDataItemId(syItem.getSyOrderDataItemId());//获取到订单子表id
 				syPreAssembledPackingListItemMapper.insert(item1);//添加子表数据
 				//原剩余数量-预装箱单装箱数量=新剩余数量
@@ -126,6 +127,8 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				item1.setSyDeclarationElementsItemId(syDeclarationElementsItemId);
 				//获取发育明细数据
 				SyShippingDetailsItem syItem=syShippingDetailsItemMapper.selectById(item1.getSyDeclarationElementsItemId());
+				//获取委外/采购订单子表Id
+				item1.setOmpoIdItem(syItem.getOmpoIdItem());
 				//获取订单子表id
 				item1.setSyOrderDataItemId(syItem.getSyOrderDataItemId());
 				if(item.getIsAdd()>0){//如果为0就添加数据
@@ -346,4 +349,23 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 		return "提交成功";
 	}
 
+	@Override
+	public String updateShipping() {
+		QueryWrapper queryWrapper=new QueryWrapper();
+		queryWrapper.groupBy("sy_pre_assembled_packing_list_id");
+		List<SyPreAssembledPackingListItem> items=syPreAssembledPackingListItemMapper.selectList(queryWrapper);
+		SyShippingDetailsItem syItem=null;
+		SyPreAssembledPackingList main=null;
+		System.out.println("items的长度为:\t"+items.size());
+		for(SyPreAssembledPackingListItem item:items){
+			syItem=syShippingDetailsItemMapper.selectById(item.getSyDeclarationElementsItemId());
+			if(syItem!=null){
+				main=syPreAssembledPackingListMapper.selectById(item.getSyPreAssembledPackingListId());
+				main.setCustomerAbbreviation(syItem.getCustomerAbbreviation());
+				syPreAssembledPackingListMapper.updateById(main);
+			}
+		}
+		return "true";
+	}
+
 }