装箱单面料改动

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

@@ -19,7 +19,7 @@
         sy_order_data.customer_Code AS customerCode, /*客户编码 customer */
         sy_order_data.business_Type_Value,/*业务类型*/
         sy_order_data.salesman,/*业务员*/
-        sy_shipping_details.u8_Remarks,/*u8备注*/
+        sy_shipping_details.memo u8_Remarks,/*u8备注*/
         sy_order_data.sales_Department,/*业务部门(销售部门)*/
         sy_order_data.garment_Factory AS garmentFactory, /*成衣工厂 garmentFactory m*/
         sy_shipping_details.order_Type AS  orderType, /*订单类型 m*/
@@ -188,7 +188,7 @@
     /*and a.state=1*/
     and submit_status=1
     and inventory_ccode like '19%'
-    GROUP BY b.group_id
+    GROUP BY a.id,b.group_id
     ORDER BY a.document_no DESC) AS t
     ${ew.customSqlSegment}
     </select>

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

@@ -51,9 +51,9 @@ public class PackingLineVo {
     @ApiModelProperty("实际装箱数量")
     private java.math.BigDecimal actualPackingQty;//实际装箱数量
     @ApiModelProperty("启始箱号")
-    private String startBoxNo;//启始箱号
+    private Integer startBoxNo;//启始箱号
     @ApiModelProperty("结束箱号")
-    private String endBoxNo;//结束箱号
+    private Integer endBoxNo;//结束箱号
     @ApiModelProperty("实际配码规格")
     private String actualSizeSpec;//实际配码规格
     @ApiModelProperty("件数/每箱")

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

@@ -15,8 +15,8 @@
 
 	<select id="getSyShippingDetailsData" parameterType="java.lang.String" resultType="org.jeecg.modules.splfi.entity.SyPackingListFabricItem">
 		SELECT
-			a.id as syDeclarationElementsId,
-			b.id as syDeclarationElementsItemId,
+			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,
 			a.declaration_Name,/*报关品名*/
 			c.master_Metering,/*主计量*/
@@ -48,8 +48,8 @@
 
 	<select id="getSyShippingDetailsDatas" resultType="org.jeecg.modules.splfi.entity.SyPackingListFabricItem">
 		SELECT
-			a.id as syDeclarationElementsId,
-			b.id as syDeclarationElementsItemId,
+		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,
 			a.declaration_Name,/*报关品名*/
 			c.master_Metering,/*主计量*/

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

@@ -49,7 +49,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		Map<String,String> mapId=new HashMap<String, String>();//key为发运明细子表id，value为分组id
 		for(SyPackingListFabricItem entity:syPackingListFabric.getSyPackingListFabricItem()) {
 			entity.setRemainingQuantity(entity.getInventoryQuantity());//入库数量
-			String key=entity.getSyShippingDetailsId();//获取发运明细子表id
+			String key=entity.getSyShippingDetailsItemId();//获取发运明细子表id
 			if(!mapId.containsKey(key)){//如果这个发运明细id没有分组id,就生成一个新的分组id
 				mapId.put(key,oConvertUtils.getId());
 			}
@@ -79,6 +79,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		
 		//2.子表数据重新插入
 		for(SyPackingListFabricItem entity:syPackingListFabricItemList) {
+			entity.setDelFlag("0");
 			//外键设置
 			entity.setSyPackingListFabricId(syPackingListFabric.getId());
 			if(entity.getIsAdd()>0){//大于1就是新增数据