预装箱单参照发运明细规则变动

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

@@ -269,4 +269,6 @@ public class SyShippingDetailsVo {
     private String flourOrGarment;
     //报关要素主表ID
     private String elementsId;
+    //分组id
+    private String groupId;
 }

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

@@ -192,17 +192,22 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 		 return result;
 	 }
 
-	 @AutoLog(value = "参照发运明细-通过主表id查询")
-	 @ApiOperation(value="参照发运明细-通过主表id查询", notes="参照发运明细-通过主表id查询")
+	 @AutoLog(value = "参照发运明细-通过主表id和groupId查询")
+	 @ApiOperation(value="参照发运明细-通过主表id和groupId查询", notes="参照发运明细-通过主表id和groupId查询")
 	 @GetMapping(value = "/queryShippingDetails")
-	 public Result<SyPreAssembledPackingList> queryPageList4(@RequestParam(name="id") String id) {
-		 //通过输入id来获取发运明细的数据
+	 public Result<SyPreAssembledPackingList> queryPageList4(@RequestParam(name="id") String id,
+															 @RequestParam(name="groupId") String groupId) {
+	 	 //通过输入id来获取发运明细的数据
 		 Result<SyPreAssembledPackingList> result = new Result<>();
 		 if(oConvertUtils.isEmpty(id)){
 		 	result.setSuccess(false);
 		 	result.setMessage("未找到id");
 		 }
-		 SyPreAssembledPackingList syPreAssembledPackingList=syPreAssembledPackingListService.queryPageList3(id);//获取数据
+		 if(oConvertUtils.isEmpty(groupId)){
+			 result.setSuccess(false);
+			 result.setMessage("未找到groupId");
+		 }
+		 SyPreAssembledPackingList syPreAssembledPackingList=syPreAssembledPackingListService.queryPageList3(id,groupId);//获取数据
 		 /*for(SyPreAssembledPackingListItem spapl_item : syPreAssembledPackingList.getSyPreAssembledPackingListItemList()){
 			 spapl_item.setSizeTables(syPreAssembledPackingListItemService.selectSize(spapl_item.getWithCode(),spapl_item.getTotal()));
 		 }*/
@@ -229,7 +234,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 	public Result<SyPreAssembledPackingList> add(@RequestBody SyPreAssembledPackingList syPreAssembledPackingList) {
 		Result<SyPreAssembledPackingList> result=new Result<>();
 		try{
-			if(oConvertUtils.isEmpty(syPreAssembledPackingList)){
+			if(oConvertUtils.isEmpty(syPreAssembledPackingList.getItemNumber())){
 				result.setMessage("请先填好信息再提交");
 				result.setSuccess(false);
 				return result;

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

@@ -241,7 +241,7 @@ public class SyPreAssembledPackingListItem implements Serializable {
 
 	/**是否新增*/
 	@TableField(exist = false)
-	//@ExcelCollection(name="二维表格")
+	//@ExcelCollection(name="是否新增")
 	@ApiModelProperty(value = "是否新增")
 	private int isAdd;
 

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

@@ -24,7 +24,7 @@ public interface SyPreAssembledPackingListItemMapper extends BaseMapper<SyPreAss
 
 	public List<SyPreAssembledPackingListItem> selectAll(String mainId);
 
-	public List<SyPreAssembledPackingListItem> selectSyShippingDetailsItemData(@Param("value")String value);
+	public List<SyPreAssembledPackingListItem> selectSyShippingDetailsItemData(@Param("id")String id,@Param("groupId")String groupId);
 
 	public List<SizeTable> selectSize(@Param("begin") String begin,@Param("end") String end);
 
@@ -32,7 +32,7 @@ public interface SyPreAssembledPackingListItemMapper extends BaseMapper<SyPreAss
 
 	public List<SizeTable> querySizes2(String ids);
 
-	public List<SizeTable> querySize(@Param("value")String value,@Param("color")String color);
+	public List<SizeTable> querySize(@Param("value")String value,@Param("groupId")String groupId);
 
 	public List<SizeTable> querySize2(@Param("groupId")String groupId,@Param("value2") String pid);
 

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

@@ -63,7 +63,7 @@
 		WHERE sy_pre_assembled_packing_list_id = #{value}
 	</select>
 
-	<select id="selectSyShippingDetailsItemData" parameterType="java.lang.String" resultType="org.jeecg.modules.spapl.entity.SyPreAssembledPackingListItem">
+	<select id="selectSyShippingDetailsItemData" resultType="org.jeecg.modules.spapl.entity.SyPreAssembledPackingListItem">
 		 SELECT
 		 	sy_shipping_details_item.shipping_details_id syDeclarationElementsId,/*发育明细主表id s*/
 		 	sy_shipping_details_item.id syDeclarationElementsItemId,/*发育明细子表id s*/
@@ -89,13 +89,16 @@
 			sum(sy_shipping_details_item.shipment_Quantity) actual_Packing_Qty,/*实际装箱数量*/
             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.pur_Or_Sub_Order  spurOrSubOrder/*采购/委外订单号 s*/
 		 FROM sy_shipping_details
 		 LEFT JOIN sy_shipping_details_item
 		 ON sy_shipping_details.`id`=sy_shipping_details_item.`shipping_details_id`
 		 LEFT JOIN sy_order_data_item
 		 ON sy_shipping_details_item.sy_order_data_item_id=sy_order_data_item.id
-		 where sy_shipping_details_item.del_flag = 0 and shipping_details_id =#{value}
+		 where sy_shipping_details_item.del_flag = 0
+		 and shipping_details_id =#{id}
+		 and sy_shipping_details_item.group_id=#{groupId}
 		group by  sy_shipping_details_item.colour
 	</select>
 
@@ -124,7 +127,8 @@
 		FROM sy_pre_assembled_packing_list_item
 		LEFT JOIN sizetable ON sy_pre_assembled_packing_list_item.`size`=sizetable.`size`
 		OR sy_pre_assembled_packing_list_item.`size`=sizetable.`alias`
-		WHERE sy_pre_assembled_packing_list_id =#{value} and sy_pre_assembled_packing_list_item.del_flag=0
+		WHERE sy_pre_assembled_packing_list_id =#{value}
+		 and sy_pre_assembled_packing_list_item.del_flag=0
 		ORDER BY sizetable.num
 	</select>
 
@@ -139,7 +143,7 @@
 		LEFT JOIN sizetable ON sy_shipping_details_item.`size`=sizetable.`size`
 		OR sy_shipping_details_item.`size`=sizetable.`alias`
 		WHERE shipping_details_id=#{value}
-			and sy_shipping_details_item.colour=#{color}
+			and sy_shipping_details_item.group_id=#{groupId}
 			and sy_shipping_details_item.del_flag=0
 		ORDER BY sizetable.num
 	</select>

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

@@ -165,6 +165,7 @@
         b.account AS account,
         a.english_product_name AS englishProductName,
         b.garment_factory AS garmentFactory,
+        b.group_id as group_id,
         excess_quantity
         FROM sy_shipping_details a
         LEFT JOIN sy_shipping_details_item b
@@ -173,7 +174,8 @@
     a.del_flag = 0
     and a.state=1
     and inventory_ccode like '19%'
-    GROUP BY a.id ORDER BY a.document_no DESC) AS t
+    GROUP BY b.group_id
+    ORDER BY a.document_no DESC) AS t
     ${ew.customSqlSegment}
     </select>
 </mapper>

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

@@ -56,7 +56,7 @@ public interface ISyPreAssembledPackingListService extends IService<SyPreAssembl
 	 * @param id
 	 * @return
 	 */
-	public SyPreAssembledPackingList queryPageList3(String id);
+	public SyPreAssembledPackingList queryPageList3(String id,String groupId);
 
 	/**
 	 * 汇总预装箱单

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

@@ -271,16 +271,16 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 	}
 
 	@Override
-	public SyPreAssembledPackingList queryPageList3(String id) {
+	public SyPreAssembledPackingList queryPageList3(String id,String gqroupId) {
 		SyPreAssembledPackingList syPreAssembledPackingList=syPreAssembledPackingListMapper.selectSyShippingDetailsData(id);
 		if(oConvertUtils.isEmpty(syPreAssembledPackingList)){
 			return null;//如果id为空那就直接退出
 		}
 		//SyPreAssembledPackingList syPreAssembledPackingList=new SyPreAssembledPackingList();
 		List<SizeTable> sizes=null;
-		List<SyPreAssembledPackingListItem> list=syPreAssembledPackingListItemMapper.selectSyShippingDetailsItemData(id);
+		List<SyPreAssembledPackingListItem> list=syPreAssembledPackingListItemMapper.selectSyShippingDetailsItemData(id,gqroupId);
 		for(SyPreAssembledPackingListItem item :list){
-			sizes=syPreAssembledPackingListItemMapper.querySize(item.getSyDeclarationElementsId(),item.getColour());//获取尺码信息
+			sizes=syPreAssembledPackingListItemMapper.querySize(item.getSyDeclarationElementsId(),item.getGroupId());//获取尺码信息
 			int row=0;
 			for (SizeTable size : sizes){
 				size.setNum(++row);