预装箱单和面料bug修改

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

@@ -19,7 +19,7 @@ import org.jeecg.modules.spapl.vo.SyPreAssembledPackingListVo;
  */
 public interface SyPreAssembledPackingListMapper extends BaseMapper<SyPreAssembledPackingList> {
 
-   SyPreAssembledPackingList  selectSyShippingDetailsData(String id);
+   SyPreAssembledPackingList  selectSyShippingDetailsData(@Param("value")String id,@Param("groupId")String groupId);
 
    SyPreAssembledPackingList  selectByOneId(String id);
 

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

@@ -113,7 +113,7 @@
 		 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
+		group by  sy_shipping_details_item.group_id
 	</select>
 
 	<select id="selectSize" resultType="org.jeecg.modules.spapl.entity.SizeTable" parameterType="java.lang.String">

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

@@ -10,14 +10,16 @@
     SELECT
         sy_shipping_details.id AS syDeclarationElementsId, /*发运明细主表id*/
         (SELECT sy_shipping_details_item.`order_Number` FROM sy_shipping_details_item
-        WHERE shipping_details_id=sy_shipping_details.id LIMIT 1) as orderNumber,/*销售订单号*/
+        WHERE shipping_details_id=sy_shipping_details.id and sy_shipping_details_item.group_id=#{groupId}
+         LIMIT 1) as orderNumber,/*销售订单号*/
         sy_order_data.id AS sy_order_data_id, /*订单数据主表id*/
 /*        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 */
         (SELECT sy_shipping_details_item.`customer_Abbreviation` FROM sy_shipping_details_item
-        WHERE shipping_details_id=sy_shipping_details.id LIMIT 1) customer_Abbreviation,/*客户简称*/
+        WHERE shipping_details_id=sy_shipping_details.id and sy_shipping_details_item.group_id=#{groupId}
+         LIMIT 1) customer_Abbreviation,/*客户简称*/
         sy_order_data.customer_Code AS customerCode, /*客户编码 customer */
         sy_order_data.business_Type_Value,/*业务类型*/
         sy_order_data.salesman,/*业务员*/
@@ -26,11 +28,14 @@
         sy_order_data.garment_Factory AS garmentFactory, /*成衣工厂 garmentFactory m*/
         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,/*采购/委外订单号*/
+        WHERE shipping_details_id=sy_shipping_details.id and sy_shipping_details_item.group_id=#{groupId}
+         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*/
+        WHERE shipping_details_id=sy_shipping_details.id   and sy_shipping_details_item.group_id=#{groupId}
+         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*/
+        WHERE shipping_details_id=sy_shipping_details.id and sy_shipping_details_item.group_id=#{groupId}
+         LIMIT 1) elements_id /*申报要素ID*/
     FROM sy_shipping_details
     LEFT JOIN sy_order_data
     ON sy_shipping_details.`sy_order_data_id`=sy_order_data.`id`

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

@@ -181,7 +181,6 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 	@Transactional
 	public SyPreAssembledPackingList saveMain2(SyPreAssembledPackingList syPreAssembledPackingList) {
 		List<SyPreAssembledPackingListItem> items=syPreAssembledPackingList.getSyPreAssembledPackingListItemList();
-		//syPreAssembledPackingList.setDocumentNo(oConvertUtils.id());//随机单据号
 
 		SimpleDateFormat sf= new SimpleDateFormat("yyyyMMdd");
 		QueryWrapper<SyPreAssembledPackingList> queryWrapperCount=new QueryWrapper<>();
@@ -311,7 +310,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 
 	@Override
 	public SyPreAssembledPackingList queryPageList3(String id,String gqroupId) {
-		SyPreAssembledPackingList syPreAssembledPackingList=syPreAssembledPackingListMapper.selectSyShippingDetailsData(id);
+		SyPreAssembledPackingList syPreAssembledPackingList=syPreAssembledPackingListMapper.selectSyShippingDetailsData(id,gqroupId);
 		if(oConvertUtils.isEmpty(syPreAssembledPackingList)){
 			return null;//如果id为空那就直接退出
 		}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -82,6 +82,8 @@ public class SyPackingListFabricController {
 		String orderNumber=syPackingListFabric.getOrderNumber();//获取订单号
 		String containerNumber=syPackingListFabric.getContainerNumber();//获取集装箱号
 		syPackingListFabric.setOrderNumber(null);//设置为null
+		LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+		System.out.println("sysUser的数据为:\t"+sysUser);
 		QueryWrapper<SyPackingListFabric> queryWrapper = QueryGenerator.initQueryWrapper(syPackingListFabric, req.getParameterMap());
 		if(oConvertUtils.isNotEmpty(orderNumber)){
 			queryWrapper.eq("a.order_number",orderNumber);
@@ -153,16 +155,19 @@ public class SyPackingListFabricController {
 	 @AutoLog(value = "提供发运明细id获取数据")
 	 @ApiOperation(value="提供发运明细id获取数据", notes="提供发运明细id获取数据")
 	 @GetMapping(value = "/getShippingDetailId")
-	 public Result<SyPackingListFabric>  getSyShippingDetailsData(String[] ids,String token) throws ParseException {
+	 public Result<SyPackingListFabric>  getSyShippingDetailsData(String[] ids,String[] groupIds) throws ParseException {
 		 Result<SyPackingListFabric> result=new Result<>();
 		if(oConvertUtils.isEmpty(ids)){
 			result.setMessage("id不能为空");
 			result.setSuccess(false);
 			return result;
 		}
-		SyPackingListFabric syPackingListFabric=syPackingListFabricService.getSyShippingDetailsData(ids);
-		 System.out.println("token\t"+token);
-		syPackingListFabric.setPreparedBy(JwtUtil.getUsername(token));
+		//public Result<SyPackingListFabric>  getSyShippingDetailsData(String[] ids,String[] groupIds)
+		 System.out.println("数组长度"+ids.length);
+		 System.out.println("分组id长度"+groupIds.length);
+		SyPackingListFabric syPackingListFabric=syPackingListFabricService.getSyShippingDetailsData(ids,groupIds);
+		//syPackingListFabric.setPreparedBy(JwtUtil.getUsername(token));
+		 syPackingListFabric.setPreparedBy("admin");
 		result.setResult(syPackingListFabric);
 		result.setSuccess(true);
 		result.setMessage("成功");
@@ -201,7 +206,7 @@ public class SyPackingListFabricController {
 	  */
 	 @AutoLog(value = "装箱单面料-提交")
 	 @ApiOperation(value="装箱单面料-提交", notes="装箱单面料-提交")
-	 @PostMapping(value = "/submit")
+	 @GetMapping(value = "/submit")
 	 public Result<SyPackingListFabric> submit(String id) {
 		 Result<SyPackingListFabric> result=new Result<>();
 		 if(oConvertUtils.isEmpty(id)){
@@ -231,7 +236,7 @@ public class SyPackingListFabricController {
 	  */
 	 @AutoLog(value = "装箱单面料-取消提交")
 	 @ApiOperation(value="装箱单面料-取消提交", notes="装箱单面料-取消提交")
-	 @PostMapping(value = "/cancelSubmit")
+	 @GetMapping(value = "/cancelSubmit")
 	 public Result<SyPackingListFabric> cancelSubmit(String id) {
 		 Result<SyPackingListFabric> result=new Result<>();
 		 if(oConvertUtils.isEmpty(id)){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/entity/SyPackingListFabric.java

@@ -114,9 +114,9 @@ public class SyPackingListFabric implements Serializable {
 	@ApiModelProperty(value = "数量")
 	private java.math.BigDecimal quantity;
 	/**分组id*/
-	@TableField(exist = false)
+/*	@TableField(exist = false)
 	@ApiModelProperty(value = "分组id")
-	private String groupId;
+	private String groupId;*/
 	/**子表数据*/
 	@TableField(exist = false)
 	@ApiModelProperty(value = "子表数据")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/entity/SyPackingListFabricItem.java

@@ -240,4 +240,12 @@ public class SyPackingListFabricItem implements Serializable {
 	@ApiModelProperty(value = "是否新增")
 	@TableField(exist = false)
 	private int isAdd;
+	/**剩余数量*/
+	@Excel(name = "剩余数量", width = 15)
+	@ApiModelProperty(value = "剩余数量")
+	@TableField(exist = false)
+	private Integer surplusQuantity;
+	/**申报要素ID*/
+	@ApiModelProperty(value = "申报要素ID")
+	private String elementsId;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/SyPackingListFabricItemMapper.java

@@ -25,5 +25,5 @@ public interface SyPackingListFabricItemMapper extends BaseMapper<SyPackingListF
 	public List<SyPackingListFabricItem> getSyShippingDetailsData(String id);
 
 	//根据id获取发运明细数据
-	public List<SyPackingListFabricItem> getSyShippingDetailsDatas(@Param("ids") String[] ids);
+	public List<SyPackingListFabricItem> getSyShippingDetailsDatas(@Param("ids") String[] ids,@Param("groupIds") String[] groupIds);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/SyPackingListFabricMapper.java

@@ -21,7 +21,7 @@ public interface SyPackingListFabricMapper extends BaseMapper<SyPackingListFabri
     public IPage<SyShippingDetailsVo> queryShippingDetails(IPage<SyShippingDetailsVo> page, @Param("ew") QueryWrapper<SyShippingDetailsVo> queryWrapper);
 
     //根据id获取发运明细数据
-    public List<SyPackingListFabric> getSyShippingDetailsData(@Param("ids") String[] ids);
+    public SyPackingListFabric getSyShippingDetailsData(@Param("ids") String[] ids);
 
     //根据id获取发运明细数据
     public SyPackingListFabric selectById2(@Param("id") String id,@Param("groupId") String groupId);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricItemMapper.xml

@@ -18,12 +18,15 @@
 			a.id syShippingDetailsId,
 			b.id syShippingDetailsItemId,
 			/*IF(INSTR(c.OMPO_id,'-')>0,LEFT(c.OMPO_id,INSTR(c.OMPO_id,'-')-1),c.OMPO_id) PlanLotNumber,*/
-	IF(INSTR(b.pur_or_sub_order,'-')>0,LEFT(b.pur_or_sub_order,INSTR(b.pur_or_sub_order,'-')-1),b.pur_or_sub_order) PlanLotNumber,
-			a.declaration_Name,/*报关品名*/
+			IF(INSTR(b.pur_or_sub_order,'-')>0,LEFT(b.pur_or_sub_order,INSTR(b.pur_or_sub_order,'-')-1),b.pur_or_sub_order) PlanLotNumber,
+			/*a.declaration_Name,报关品名*/
+			(select declaration_Name from sy_declaration_elements where id=b.elements_Id) as declaration_Name,
 			c.master_Metering,/*主计量*/
+			c.weight as gramWeight,/*克重*/
 			b.salesman,/*业务员*/
 			b.item_Number,/*款号*/
 			b.order_Number,/*订单号*/
+			b.u8_Remarks memo,
 			b.colour,/*颜色*/
 			b.inventory_Code,/*物料编码*/
 			b.inventory_Name,/*物料名称*/
@@ -35,6 +38,7 @@
 			b.manual_Yarn_Unit_Price,/*手册纱单价*/
 			b.manual_Yarn_Proportion,/*手册纱占比*/
 			b.shipment_Quantity AS inventoryQuantity,/*入库数量*/
+			b.elements_Id,/*申报要素*/
 			b.specification_And_Model,/*规格型号*/
 			b.excess_Quantity	/*excessQuantity*/
 		FROM
@@ -52,13 +56,17 @@
 		SELECT
 			a.id syShippingDetailsId,
 			b.id syShippingDetailsItemId,
+			(select declaration_Name from sy_declaration_elements where id=b.elements_Id) as declaration_Name,
 			/*IF(INSTR(c.OMPO_id,'-')>0,LEFT(c.OMPO_id,INSTR(c.OMPO_id,'-')-1),c.OMPO_id) PlanLotNumber,*/
 			IF(INSTR(b.pur_or_sub_order,'-')>0,LEFT(b.pur_or_sub_order,INSTR(b.pur_or_sub_order,'-')-1),b.pur_or_sub_order) PlanLotNumber,
-			a.declaration_Name,/*报关品名*/
+			/*a.declaration_Name,报关品名*/
 			c.master_Metering,/*主计量*/
+			c.Weight as gramWeight,/*克重*/
 			b.salesman,/*业务员*/
 			b.item_Number,/*款号*/
 			b.colour,/*颜色*/
+			/*b.elements_Id,申报要素*/
+			b.memo,
 			b.inventory_Code,/*物料编码*/
 			b.inventory_Name,/*物料名称*/
 			b.material_Composition AS Composition,/*成分/Composition*/
@@ -83,6 +91,10 @@
 		<foreach collection="ids" item="value" index="index" open="(" separator="," close=")">
 			#{value}
 		</foreach>
+		and b.group_id in
+		<foreach collection="groupIds" item="value" index="index" open="(" separator="," close=")">
+			#{value}
+		</foreach>
 	</select>
 
 	<select id="selectByMainId2" parameterType="java.lang.String" resultType="org.jeecg.modules.splfi.entity.SyPackingListFabricItem">

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricMapper.xml

@@ -53,6 +53,7 @@
         a.whole_order_total AS wholeOrderTotal,
         b.declaration_elements AS declarationElements,
         b.number_of_sets AS numberOfSets,
+        b.group_id,
         a.chinese_name AS chineseName,
         b.account AS account,
         a.english_product_name AS englishProductName,
@@ -64,7 +65,7 @@
     WHERE  a.del_flag = 0  /*查询未删除的数据*/
     and b.submit_status=1  /*查询已提交的数据*/
     AND ( inventory_ccode NOT LIKE '19%' OR inventory_ccode IS NULL)/*查询不是成衣的数据*/
-    group by b.group_id
+    group by a.id,b.group_id
     ORDER BY a.document_no DESC
     ) AS t
     ${ew.customSqlSegment}
@@ -83,6 +84,7 @@
             #{value}
         </foreach>
         GROUP BY sy_shipping_details.id
+        limit 1     /*最多只能获取一条数据*/
     </select>
 
     <update id="deleteByMainId"  parameterType="java.lang.String">
@@ -91,12 +93,11 @@
 
     <select id="queryMain" resultType="org.jeecg.modules.splfi.entity.SyPackingListFabric">
 		SELECT
-			a.*,
-			b.group_id
+			a.*
 		FROM `sy_packing_list_fabric` a
-		left join sy_packing_list_fabric_item b
-		on a.id=b.sy_packing_list_fabric_id
-		and b.del_flag
+		/*left join sy_packing_list_fabric_item b
+		on a.id=b.sy_packing_list_fabric_id*/
+		/*and b.del_flag*/
 		${ew.customSqlSegment}
 		group by a.id
 	</select>
@@ -108,7 +109,7 @@
 		FROM `sy_packing_list_fabric` a
 		left join sy_packing_list_fabric_item b
 		on a.id=b.sy_packing_list_fabric_id
-		and b.del_flag
+		and b.del_flag=0
 		where a.id=#{id }
 		/*and b.group_id=#{groupId }*/
 		group by a.id

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/ISyPackingListFabricService.java

@@ -52,7 +52,7 @@ public interface ISyPackingListFabricService extends IService<SyPackingListFabri
 	public List<SyPackingListFabric> getSyShippingDetailsDatas(String[] ids);
 
 	//根据id获取发运明细数据
-	public SyPackingListFabric getSyShippingDetailsData(String[] ids) throws ParseException;
+	public SyPackingListFabric getSyShippingDetailsData(String[] ids,String [] groupIds) throws ParseException;
 
 	//根据id获取主表子表汇总数据
 	public SyPackingListFabric selectById(String id);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -123,23 +123,24 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 	@Override
 	public  List<SyPackingListFabric> getSyShippingDetailsDatas(String[] ids) {
-		List<SyPackingListFabric> syPackingListFabricList=syPackingListFabricMapper.getSyShippingDetailsData(ids);
+/*		SyPackingListFabric syPackingListFabricList=syPackingListFabricMapper.getSyShippingDetailsData(ids);
 		int row=0;
 		for (SyPackingListFabric syPackingListFabric : syPackingListFabricList){
 			syPackingListFabric.setSyPackingListFabricItem(syPackingListFabricItemMapper.getSyShippingDetailsData(ids[row]));
 			row++;
 		}
-		return syPackingListFabricList;
+		return syPackingListFabricList;*/
+return null;
 	}
 
 
 	//可能会获取多条数据头表数据，头表不知选那条数据
 	@Override
-	public  SyPackingListFabric getSyShippingDetailsData(String[] ids) throws ParseException {
+	public  SyPackingListFabric getSyShippingDetailsData(String[] ids,String [] groupIds) throws ParseException {
 		String time= new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis());
-		SyPackingListFabric syPackingListFabric=new SyPackingListFabric();
+		SyPackingListFabric syPackingListFabric=syPackingListFabricMapper.getSyShippingDetailsData(ids);
 		syPackingListFabric.setPreparedDate(new SimpleDateFormat("yyyy-MM-dd").parse(time));//获取制单日期
-		syPackingListFabric.setSyPackingListFabricItem(syPackingListFabricItemMapper.getSyShippingDetailsDatas(ids));
+		syPackingListFabric.setSyPackingListFabricItem(syPackingListFabricItemMapper.getSyShippingDetailsDatas(ids,groupIds));
 		return syPackingListFabric;
 	}