成衣装箱单bug修复

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

@@ -199,12 +199,10 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 			 	syPreAssembledPackingListItemMapper.deleteByGroupId(item2.getGroupId());
 			 }
 		}
-		long startTime2 = System.currentTimeMillis();
 		typeConversion(items3);//修改预托书数量
 		syPreAssembledPackingListItemService.updateBatchById(items3);
 		long endTime = System.currentTimeMillis();
 		System.out.println("全程的时间：" + (endTime - startTime) + "ms");
-		System.out.println("update的时间：" + (endTime - startTime2) + "ms");
 		//return new BigDecimal("0");
 
 		//syPreAssembledPackingListItemMapper.deleteByMainId(pid);//将子表的删除状态都变成1

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -201,13 +201,13 @@ public class SyPackingListTailoringController {
 			 result.setMessage("未获取到id的信息");
 			 return result;
 		 }
-		 int num=0;
+		// int num=0;
 		 for (String id : ids){
 			SyPackingListTailoring syPackingListTailoring=syPackingListTailoringService.querySpaplId(id);
 			syPackingListTailoringService.saveMain2(syPackingListTailoring);
-			num++;
+			//num++;
 		 }
-		 result.setMessage("生成"+num+"条数据！");
+		 result.setMessage("生成"+ids.length+"条数据！");
 		 result.setSuccess(true);
 		 return result;
 	 }
@@ -268,13 +268,13 @@ public class SyPackingListTailoringController {
 		 if(oConvertUtils.isNotEmpty(endDate)){//结束
 			 queryWrapper.le("b.hod",endDate);
 		 }
-		 if(oConvertUtils.isNotEmpty(orderStatus)){//选择正常或者超发状态
+		/* if(oConvertUtils.isNotEmpty(orderStatus)){//选择正常或者超发状态
 			 if(orderStatus.equals("n")){
 				 queryWrapper.le("b.remaining_Quantity",0);//小于等于0--超发
 			 }else{
 				 queryWrapper.gt("b.remaining_Quantity",0);//大于0--正常
 			 }
-		 }
+		 }*/
 		 if(oConvertUtils.isNotEmpty(isReference)){//是否已经被成衣装箱单参照
 			 if(isReference.equals("n")){
 				 queryWrapper.eq("a.is_Reference","1");//未被成衣装箱单参照

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/SyPackingListTailoringMapper.java

@@ -21,6 +21,8 @@ import java.util.Map;
 public interface SyPackingListTailoringMapper extends BaseMapper<SyPackingListTailoring> {
     public SyPackingListTailoring querySpaplId(String id);
 
+    //public List<SyPackingListTailoring> querySpaplIds(String[] ids);
+
     public SyPackingListTailoring getMainId(String id);
 
     public void deleteByMainId(String id);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/xml/syPackingListTailoringMapper.xml

@@ -3,7 +3,6 @@
 <mapper namespace="org.jeecg.modules.splt.mapper.SyPackingListTailoringMapper">
     <select id="querySpaplId" resultType="org.jeecg.modules.splt.entity.SyPackingListTailoring">
         select
-
         a.id syPreAssembledPackingListId,/*预装箱单主表id*/
         a.order_Number,/*订单号*/
         a.item_Number,/*款号*/
@@ -38,6 +37,42 @@
 
     </select>
 
+    <!--<select id="querySpaplIds" resultType="org.jeecg.modules.splt.entity.SyPackingListTailoring">
+        select
+        a.id syPreAssembledPackingListId,/*预装箱单主表id*/
+        a.order_Number,/*订单号*/
+        a.item_Number,/*款号*/
+       /* a.product_Name,品名*/
+        a.size_Range,/*尺码范围*/
+        a.customer,/*客户*/
+        a.customer_Abbreviation,/*客户简称*/
+        a.spur_Or_Sub_Order purchase,/*采购/委外订单号*/
+        a.ompo_Id,/*采购/委外订单号id*/
+        a.container_Number,/*集装箱号*/
+        a.container_Code,/*集装箱代号*/
+        a.u8_Remarks,/*备注*/
+        (SELECT english_product_name FROM  sy_declaration_elements WHERE id=a.elements_id) englishProductName ,/*中文品名*/
+	    (SELECT declaration_name FROM  sy_declaration_elements WHERE id=a.elements_id) productName,/*英文品名*/
+        a.depositary_Receipt_No,/*预托书号*/
+        (SELECT export_Invoice_No FROM  sy_letter_deposit
+        LEFT JOIN sy_letter_deposit_item ON
+        sy_letter_deposit.id=sy_letter_deposit_item.`sy_letter_deposit_id`
+        WHERE sy_letter_deposit_item.`sy_pre_assembled_packing_list_id`=a.id
+        LIMIT 1) exportInvoiceNo,/*外销发票号-预托书主表数据*/
+        a.salesman,/*业务员*/
+        a.sales_Department,/*业务部门(销售部门)*/
+        a.business_Type_Value,/*业务类型*/
+        a.elements_Id,/*申报要素id*/
+        order_Type /*订单类型*/
+        /*a.pre_Delivery_Date,预发货日期*/
+        /*a.total_Boxes,总箱数*/
+        /*a.garment_Factory,成衣工厂*/
+        from sy_pre_assembled_packing_list a
+        where id=#{value}
+        and a.del_flag=0
+
+    </select>-->
+
     <update id="deleteByMainId" parameterType="java.lang.String">
         update sy_packing_list_tailoring set del_flag='1' where id=#{value}
     </update>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/ISyPackingListTailoringService.java

@@ -103,4 +103,6 @@ public interface ISyPackingListTailoringService extends IService<SyPackingListTa
 	public List<SyPackingListTailoringItem> getList(String id) ;
 
 	public Map<String,Object> getSyShippingOrder(String id);
+
+	//public Integer querySpaplIds(String[] ids);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/impl/SyPackingListTailoringServiceImpl.java

@@ -380,6 +380,13 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		}
 		syPackingListTailoringItemMapper.deleteByMainId(id);
 		syPackingListTailoringMapper.deleteByMainId(id);
+		UpdateWrapper updateWrapper=new UpdateWrapper();
+		updateWrapper.eq("id",syPackingListTailoring.getSyPreAssembledPackingListId());
+		updateWrapper.set("is_Reference","1");
+		syPreAssembledPackingListMapper.update(null,updateWrapper);
+
+		//syPreAssembledPackingListMapper.deleteId(syPackingListTailoring.getSyPreAssembledPackingListId());
+		//syPreAssembledPackingListItemMapper.deleteByMainId(syPackingListTailoring.getSyPreAssembledPackingListId());
 	/*	QueryWrapper queryWrapper=new QueryWrapper();
 		queryWrapper.eq("tailoring_Fabric_Id",id);//条件
 		SyShippingOrderItem syShippingOrderItem=syShippingOrderItemMapper.selectOne(queryWrapper);
@@ -1400,4 +1407,33 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 	public Map<String,Object> getSyShippingOrder(String id) {
 		return syPackingListTailoringMapper.getSyShippingOrder(id);
 	}
+
+	/*@Override
+	@Transactional
+	public Integer querySpaplIds(String[] ids) {
+		List<SyPackingListTailoring> syPackingListTailorings=syPackingListTailoringMapper.querySpaplIds(ids);
+		if(syPackingListTailorings.size()==0){
+			return null;
+		}
+		//获得所有尺码组
+		List<SizeTable> sizes=syPreAssembledPackingListItemMapper.querySizes2(ids);
+		if(sizes.size()>0){
+			syPackingListTailoring.setSizeTables(this.sort(sizes));
+		}
+		//获取子表数据
+		List<SyPackingListTailoringItem> items=syPackingListTailoringItemMapper.querySpaplItemId(id);
+		if(items.size()>0){
+			for (SyPackingListTailoringItem item : items){
+				//循环子表获得尺码组
+				item.setSizeTables(sort(syPreAssembledPackingListItemMapper.querySize2(item.getGroupId(),item.getSyPreAssembledPackingListId())));
+				String planSize="";
+				for (SizeTable size:item.getSizeTables()){
+					planSize+=size.getSize()+":"+size.getQuantity()+"+";
+				}
+				item.setPlanSize(planSize.substring(0,planSize.length()-1));//截取最后一位+号
+			}
+			syPackingListTailoring.setSyPackingListTailoringItemList(items);
+		}
+		return syPackingListTailorings.size();
+	}*/
 }