预装箱单

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

@@ -42,7 +42,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
- /**
+/**
  * @Description: 预装箱单主表
  * @Author: jeecg-boot
  * @Date:   2022-04-20
@@ -282,7 +282,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 		 	//查询IP及账套信息、时间戳
 			 QueryWrapper<DxpDataPlan> queryWrapper = new QueryWrapper<>();
 			 //获取推送接口地址
-			 queryWrapper.eq("code", "senYu_syShipping").or().eq("code","senYu_SH_token");
+			 queryWrapper.eq("code", "senYu_YCY_local").or().eq("code","senYu_YCY_token");
 			 queryWrapper.orderBy(true,true,"id");
 			 Page<DxpDataPlan> page = new Page<DxpDataPlan>(1, 10);
 			 IPage<DxpDataPlan> pageList = iDxpDataPlanService.page(page, queryWrapper);
@@ -320,6 +320,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 				 System.out.println("推送过去了");
 			 }else{
 				 syPreAssembledPackingList.setPushStatus("2");
+				 System.out.println("失败原因:\t"+message);
 				 System.out.println("推送失败了");
 			 }
 			 syPreAssembledPackingListService.updateById(syPreAssembledPackingList);
@@ -647,14 +648,10 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 		return dateNo;
 	 }
 
-	 @AutoLog(value = "测试")
-	 @ApiOperation(value="测试", notes="测试")
-	 @GetMapping(value = "/deletee")
-	 public int deletee(String id){
-		 QueryWrapper<SyPreAssembledPackingListItem> queryWrapperCount =new QueryWrapper<>();
-		 queryWrapperCount.select("sum(total) total");
-		 queryWrapperCount.eq("del_Flag","0");
-		 queryWrapperCount.eq("sy_Pre_Assembled_Packing_List_Id",id);
-		 return syPreAssembledPackingListItemService.getOne(queryWrapperCount).getTotal().intValue();
-	 }
+	@AutoLog(value = "getToken")
+	@ApiOperation(value="getToken", notes="getToken")
+	@GetMapping(value = "/token")
+	public String token(){
+		return "token";
+	}
 }

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

@@ -38,6 +38,9 @@ public class SyPreAssembledPackingList implements Serializable {
 	/**发运明细主表id*/
 	@ApiModelProperty(value = "发运明细主表id")
 	private String syDeclarationElementsId;
+	/**订单数据主表id*/
+	@ApiModelProperty(value = "订单数据主表id")
+	private String syOrderDataId;
 	/**订单号 可能要自动生成*/
 	@Excel(name="订单号", width = 25,needMerge = true,groupName = "主表信息")
 	@ApiModelProperty(value = "订单号")
@@ -81,6 +84,25 @@ public class SyPreAssembledPackingList implements Serializable {
 	/**总箱数*/
 	@ApiModelProperty(value = "总箱数")
 	private java.math.BigDecimal totalBoxes;
+	/**总件数*/
+	@ApiModelProperty(value = "总件数")
+	private java.math.BigDecimal total;
+	/**总净重*/
+	@Excel(name = "总净重", width = 15)
+	@ApiModelProperty(value = "总净重")
+	private java.math.BigDecimal totalNetWeight;
+	/**总毛重*/
+	@Excel(name = "总毛重", width = 15)
+	@ApiModelProperty(value = "总毛重")
+	private java.math.BigDecimal totalGrossWeight;
+	/**总体积*/
+	@Excel(name = "总体积", width = 15)
+	@ApiModelProperty(value = "总体积")
+	private java.math.BigDecimal totalVolume;
+	/**总价*/
+	@Excel(name = "总价", width = 15)
+	@ApiModelProperty(value = "总价")
+	private java.math.BigDecimal totalPrice;
 	/**总净重*//*
 	@ApiModelProperty(value = "总净重")
 	private java.math.BigDecimal totalNetWeight;

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

@@ -44,6 +44,12 @@ public class SyPreAssembledPackingListItem implements Serializable {
     //@Excel(name = "发运明细子表id", width = 15)
 	@ApiModelProperty(value = "发运明细子表id")
 	private String syDeclarationElementsItemId;
+	/**订单数据主表id*/
+	@ApiModelProperty(value = "订单数据主表id")
+	private String syOrderDataId;
+	/**订单数据子表id*/
+	@ApiModelProperty(value = "订单数据子表id")
+	private String syOrderDataItemId;
 	/**账套*/
     @Excel(name = "账套", width = 25)
 	@ApiModelProperty(value = "账套")
@@ -228,4 +234,9 @@ public class SyPreAssembledPackingListItem implements Serializable {
 	@ApiModelProperty(value = "存货编码")
 	private java.lang.String inventoryCode;
 
+	/**区分成衣跟面辅料*/
+	@Excel(name = "区分成衣跟面辅料", width = 15)
+	@ApiModelProperty(value = "区分成衣跟面辅料")
+	private String inventoryCcode;
+
 }

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

@@ -65,6 +65,8 @@
 		 SELECT
 		 	sy_shipping_details_item.shipping_details_id syDeclarationElementsId,/*发育明细主表id s*/
 		 	sy_shipping_details_item.id syDeclarationElementsItemId,/*发育明细子表id s*/
+		 	sy_shipping_details_item.sy_order_data_id sy_order_data_id,/*订单数据主表id s*/
+		 	sy_shipping_details_item.sy_order_data_item_id sy_order_data_item_id,/*订单数据子表id s*/
             sy_shipping_details_item.pre_delivery_date hod, /*预发货日期 m*/
           	sy_shipping_details_item.order_Number poNo, /*pono 发育明细子表订单号 sxx*/
 		 	sy_shipping_details_item.account acSetNo,/*单据号 s*/
@@ -160,9 +162,7 @@
 	<select id="pushData" resultType="org.jeecg.modules.spapl.vo.PackingLineVo" parameterType="java.lang.String">
         SELECT
 			sort AS packingLineNum/*排序*/,
-			(SELECT sy_order_data_item_id 	FROM `sy_shipping_details_item` WHERE
-			id=sy_pre_assembled_packing_list_item.`sy_declaration_elements_item_id`)
-			AS  attributeBigint1,/*采购/委外订单行号ID（子表唯一标识）*/
+			sy_order_data_item_id 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*/,
@@ -192,6 +192,7 @@
 			total_Price AS totalPrice/*总价*/
 		FROM sy_pre_assembled_packing_list_item
 		where sy_Pre_Assembled_Packing_List_Id=#{value}
+		AND del_flag=0
 		ORDER BY packingLineNum
     </select>
 </mapper>

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

@@ -77,9 +77,7 @@
     SELECT
         document_No AS packingHeaderNum/*单据号*/,
         spur_Or_Sub_Order AS poNo,/*委外/采购订单号*/
-        (SELECT sy_order_data_id FROM `sy_shipping_details` WHERE id=
-        sy_pre_assembled_packing_list.`sy_declaration_elements_id`)
-        AS attributeBigint1,/*采购/委外订单号对应的ID（唯一标识）*/
+        sy_order_data_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/impl/SyPreAssembledPackingListServiceImpl.java

@@ -125,6 +125,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				int row=syPreAssembledPackingListItemMapper.updateById(item1);//如果没修改成功就是新增数据
 				if(row==0){//如果为0就添加数据
 					item1.setSyPreAssembledPackingListId(pid);
+					item1.setId(oConvertUtils.id());//获取到随机id
 					syPreAssembledPackingListItemMapper.insert(item1);
 				}
 				//这个构造器用来获取预装箱单里所有参照了改发运明细数量的合计

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/vo/SyPreAssembledPackingListVo.java

@@ -48,6 +48,9 @@ public class SyPreAssembledPackingListVo {
 	@ApiModelProperty(value = "客户")
   	@Excel(name = "客户", width = 15)
 	private String customer;
+	/**客户简称*/
+	@ApiModelProperty(value = "客户简称")
+	private String customerAbbreviation;
 	/**集装箱代号*/
 	@ApiModelProperty(value = "集装箱代号")
   	@Excel(name = "集装箱代号", width = 15)