Merge remote-tracking branch 'origin/master'

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationIngredientMapper.xml

@@ -296,18 +296,15 @@
     </select>
 
 	<select id="queryRemainingByIngredient" resultType="org.jeecg.modules.cost.entity.SyRemaining">
-		select tab.goodsName,ccode as planCode,tab.usageQuantity-isnull(tab1.purchaseQuantity,0) as number,
-				tab.cost as unitCost,(tab.usageQuantity-isnull(tab1.purchaseQuantity,0))*tab.cost as cost
-		from
-		(
-				select oti.cInvName as goodsName,max(om.cCode) as ccode,sum(ot.iSendQTY) as usageQuantity ,sum(pb.iCost) as cost
+		select oti.cInvName as goodsName,max(om.cCode) as planCode,sum(ot.iSendQTY) as number ,
+								max(pb.iCost) as unitCost,sum(ot.iSendQTY)*max(pb.iCost) as cost
 				from UFDATA_901_2021.dbo.om_momain om
 				join UFDATA_901_2021.dbo.OM_MODetails od on om.moid=od.moid
 				join UFDATA_901_2021.dbo.OM_MOMaterials ot on ot.MoDetailsID=od.MODetailsID
 				join UFDATA_901_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
 				join UFDATA_901_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
 				left join (
-						SELECT p.cInvCode,p.iorderdid,sum(bi.iCost) as iCost
+						SELECT p.cInvCode,p.iorderdid,max(bi.iCost) as iCost
 						from UFDATA_901_2021.dbo.PO_Podetails p
 						join UFDATA_901_2021.dbo.PO_Pomain pm on p.POID  = pm.POID
 						join UFDATA_901_2021.dbo.PurBillVouchs bi  on bi.iPOsID=p.ID
@@ -316,7 +313,7 @@
 
 						union all
 
-					 select pod.cInvCode,pod.iorderdid,sum(bi.iCost) as iCost
+					 select pod.cInvCode,pod.iorderdid,max(bi.iCost) as iCost
 					 from UFDATA_902_2021.dbo.SO_SOMain so
 					 join UFDATA_902_2021.dbo.SO_SODetails sd on so.id=sd.id
 					 join UFDATA_902_2021.dbo.PO_Podetails pd on pd.iorderdid=sd.isosid
@@ -328,68 +325,31 @@
 					 where pm.cVenCode != 'T010001' and pom.cVenCode = 'T010001'
 					 GROUP BY pod.cInvCode,pod.iorderdid
 				 ) pb on pb.cInvCode=ot.cInvCode and pb.iorderdid=od.isosid
-				WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%'
-							and om.cCode LIKE CONCAT(#{code},'%') and (oti.cInvCcode like '05%' or oti.cInvCcode like '06%'
-							or oti.cInvCcode like '07%' or oti.cInvCCode = '0399' or oti.cInvCCode = '0499')
-							and oti.cInvName = #{goodName}
-				GROUP BY oti.cInvName
-		) tab
-		left join
-		(
-				select i.cInvName,sum(rs.iQuantity) as purchaseQuantity from UFDATA_901_2021.dbo.rdrecords01 rs
-				join UFDATA_901_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
-				where iordercode in (
-						select distinct od.csocode
-						from UFDATA_901_2021.dbo.om_momain om
-						join UFDATA_901_2021.dbo.OM_MODetails od on om.moid=od.moid
-						join UFDATA_901_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-						WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
-									and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
-				) and (i.cInvCcode like '05%' or i.cInvCcode like '06%' or i.cInvCcode like '07%'
-						or i.cInvCCode = '0399' or i.cInvCCode = '0499')
-				GROUP BY i.cInvName,rs.cBatch
-		)tab1 on tab1.cInvName=tab.goodsName
-		where usageQuantity-isnull(tab1.purchaseQuantity,0)>0
+		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%'
+					and om.cCode LIKE CONCAT(#{code},'%') and (oti.cInvCcode like '05%' or oti.cInvCcode like '06%'
+					or oti.cInvCcode like '07%' or oti.cInvCCode = '0399' or oti.cInvCCode = '0499')
+					and oti.cInvName = #{goodName}
+		GROUP BY oti.cInvName
 
 		union all
 
-		select tab.goodsName,ccode as planCode,tab.usageQuantity-isnull(tab1.purchaseQuantity,0) as number,
-				tab.cost as unitCost,(tab.usageQuantity-isnull(tab1.purchaseQuantity,0))*tab.cost as cost
-		from
-		(
-				select oti.cInvName as goodsName,max(om.cCode) as ccode,sum(ot.iSendQTY) as usageQuantity ,sum(pb.iCost) as cost
-				from UFDATA_903_2021.dbo.om_momain om
-				join UFDATA_903_2021.dbo.OM_MODetails od on om.moid=od.moid
-				join UFDATA_903_2021.dbo.OM_MOMaterials ot on ot.MoDetailsID=od.MODetailsID
-				join UFDATA_903_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
-				join UFDATA_903_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-				left join (
-						SELECT p.cInvCode,p.iorderdid,sum(bi.iCost) as iCost
-						from UFDATA_903_2021.dbo.PO_Podetails p
-						join UFDATA_903_2021.dbo.PurBillVouchs bi  on bi.iPOsID=p.ID
-						GROUP BY p.cInvCode,p.iorderdid
-				 ) pb on pb.cInvCode=ot.cInvCode and pb.iorderdid=od.isosid
-				WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%'
-							and om.cCode LIKE CONCAT(#{code},'%') and (oti.cInvCcode like '05%' or oti.cInvCcode like '06%'
-							or oti.cInvCcode like '07%' or oti.cInvCCode = '0399' or oti.cInvCCode = '0499')
-							and oti.cInvName = #{goodName}
-				GROUP BY oti.cInvName
-		) tab
-		left join
-		(
-				select i.cInvName,sum(rs.iQuantity) as purchaseQuantity from UFDATA_903_2021.dbo.rdrecords01 rs
-				join UFDATA_903_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
-				where iordercode in (
-						select distinct od.csocode
-						from UFDATA_903_2021.dbo.om_momain om
-						join UFDATA_903_2021.dbo.OM_MODetails od on om.moid=od.moid
-						join UFDATA_903_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-						WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
-									and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
-				) and (i.cInvCcode like '05%' or i.cInvCcode like '06%' or i.cInvCcode like '07%'
-						or i.cInvCCode = '0399' or i.cInvCCode = '0499')
-				GROUP BY i.cInvName,rs.cBatch
-		)tab1 on tab1.cInvName=tab.goodsName
-		where usageQuantity-isnull(tab1.purchaseQuantity,0)>0
+		select oti.cInvName as goodsName,max(om.cCode) as planCode,sum(ot.iSendQTY) as number ,
+								max(pb.iCost) as unitCost,sum(ot.iSendQTY)*max(pb.iCost) as cost
+		from UFDATA_903_2021.dbo.om_momain om
+		join UFDATA_903_2021.dbo.OM_MODetails od on om.moid=od.moid
+		join UFDATA_903_2021.dbo.OM_MOMaterials ot on ot.MoDetailsID=od.MODetailsID
+		join UFDATA_903_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
+		join UFDATA_903_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+		left join (
+				SELECT p.cInvCode,p.iorderdid,max(bi.iCost) as iCost
+				from UFDATA_903_2021.dbo.PO_Podetails p
+				join UFDATA_903_2021.dbo.PurBillVouchs bi  on bi.iPOsID=p.ID
+				GROUP BY p.cInvCode,p.iorderdid
+		 ) pb on pb.cInvCode=ot.cInvCode and pb.iorderdid=od.isosid
+		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%'
+					and om.cCode LIKE CONCAT(#{code},'%') and (oti.cInvCcode like '05%' or oti.cInvCcode like '06%'
+					or oti.cInvCcode like '07%' or oti.cInvCCode = '0399' or oti.cInvCCode = '0499')
+					and oti.cInvName = #{goodName}
+		GROUP BY oti.cInvName
     </select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/mapper/xml/SyOrderDataItemMapper.xml

@@ -9,7 +9,7 @@
         FROM
             sy_order_data_item
         WHERE
-            sy_order_data_id = #{syOrderDataId}
+            sy_order_data_id = #{syOrderDataId} and inventory_ccode like '19%'
         GROUP BY
             pack_id,
             small_po,
@@ -20,6 +20,17 @@
             inventory_code,
             colour,
             coding_rules
+
+        union all
+
+        SELECT
+            sy_order_data_id,item_number,pre_delivery_date,pre_completion_date,pack_id,small_po,distribution_point,
+            inventory_code,inventory_name,specification_and_model,colour,coding_rules,guangpei_gate_width,box_number,
+            quantity as quantity,master_metering,unit_price_including_tax,total_price_and_tax as total_price_and_tax,tax_rate,remarks,bank_closed_by
+        FROM
+            sy_order_data_item
+        WHERE
+            sy_order_data_id = #{syOrderDataId}  and inventory_ccode not like '19%'
     </select>
 
     <select id="querySupplier" resultType="Map">

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -736,7 +736,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 				  for(String str:syShippingDetails.getGrouyIdList()) {
 					  QueryWrapper<SyShippingDetailsItem> queryWrapper = new QueryWrapper<>();
 					  queryWrapper.in("group_id", str).eq("del_flag", 0);
-					  List<SyShippingDetailsItem> groupList = syShippingDetailsItemService.list(itemQueryWrapper);
+					  List<SyShippingDetailsItem> groupList = syShippingDetailsItemService.list(queryWrapper);
 					  for (int i = 0; i < groupList.size(); i++) {
 						  SyShippingDetailsItem tableRow = groupList.get(i);
 						  for (int j = i+1; j < groupList.size(); j++) {
@@ -744,7 +744,9 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 							  if (tableRow.getSmallPo().equals(nextData.getSmallPo()) && tableRow.getOrderNumber().equals(nextData.getOrderNumber()) &&
 									  tableRow.getPreDeliveryDate().equals(nextData.getPreDeliveryDate()) && tableRow.getPreCompletionDate().equals(nextData.getPreCompletionDate()) &&
 									  tableRow.getItemNumber().equals(nextData.getItemNumber()) && tableRow.getInventoryCode().equals(nextData.getInventoryCode()) &&
-									  tableRow.getColour().equals(nextData.getColour()) && tableRow.getSize().equals(nextData.getSize())) {
+									  tableRow.getColour().equals(nextData.getColour()) && tableRow.getSize().equals(nextData.getSize())&&
+									  tableRow.getGuangpeiGateWidth().equals(nextData.getGuangpeiGateWidth()) && tableRow.getWeight().equals(nextData.getWeight())&&
+							          tableRow.getCodingRules().equals(nextData.getCodingRules())) {
 								  result.setSuccess(false);
 								  result.setMessage("第"+count+"条里面的第"+(i+1)+"行和第"+(j+1)+"行数据相同，无法提交");
 								  return result;
@@ -929,6 +931,12 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 				   pushvo.setMessage("该单据部分未提交，请全部提交再推送！");
 				   return pushvo;
 			   }
+			   //处理克重
+			   String weight = li.getGramWeight();
+			   int index = weight.indexOf("克");
+			   if(index > 0){
+                li.setGramWeight(weight.substring(0,weight.length()-1));
+			   }
 			  //查询主表
 			  PushShippingVO pushShippingVO =  syShippingDetailsService.pushSyShipping(id);
 			  pushShippingVO.setPoNo(li.getPoNo());

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/mapper/xml/SyShippingDetailsMapper.xml

@@ -31,13 +31,12 @@ a.end_customer) as endCustomer,
 
     </select>
 
-
+<!--查询面辅料数据-->
     <select id="queryOrderDataGarment" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.OrderDataVo">
 
-
-        select b.sy_order_data_id as syOrderDataId,GROUP_CONCAT(b.id) as syOrderDataItemId ,a.order_number as orderNumber,b.item_number as itemNumber,b.small_po as smallPo,b.pk_org as pkOrg,a.order_date as orderDate,b.inventory_name as inventoryName,
-         b.colour as colour,b.size as size,b.coding_rules as codingRules,sum(b.quantity) as quantity,a.business_type_value as businessTypeText,a.customer_order_number as customerOrderNumber,
-           a.sales_type_text as salesTypeText,a.customer_abbreviation as customerAbbreviation,a.customer_name as customerName,sum(b.surplus_num) as surplusNum,DATE_FORMAT(b.pre_completion_date,'%Y-%m-%d') as preCompletionDate,
+        select b.sy_order_data_id as syOrderDataId,b.id as syOrderDataItemId ,a.order_number as orderNumber,b.item_number as itemNumber,b.small_po as smallPo,b.pk_org as pkOrg,a.order_date as orderDate,b.inventory_name as inventoryName,
+         b.colour as colour,b.size as size,b.coding_rules as codingRules,b.quantity as quantity,a.business_type_value as businessTypeText,a.customer_order_number as customerOrderNumber,
+           a.sales_type_text as salesTypeText,a.customer_abbreviation as customerAbbreviation,a.customer_name as customerName,b.surplus_num as surplusNum,DATE_FORMAT(b.pre_completion_date,'%Y-%m-%d') as preCompletionDate,
            a.brand_side as brandSide,a.exchange_rate as exchangeRate,b.specification_and_model as specificationAndModel,a.account as account,b.inventory_code as inventoryCode,
            b.distribution_point as distributionPoint,b.pack_id as packId,b.unit_price_including_tax as unitPriceIncludingTax,guangpei_gate_width as guangpeiGateWidth,b.master_metering as masterMetering,
            b.supplier_code as supplierCode,a.garment_nmb as garmentNmb,b.garment_factory as garmentFactory,DATE_FORMAT(b.pre_delivery_date,'%Y-%m-%d') as preDeliveryDate,b.box_number as boxNumber,
@@ -50,9 +49,6 @@ a.end_customer) as endCustomer,
         on a.id = b.sy_order_data_id
         ${ew.customSqlSegment}
             AND b.inventory_ccode not like '19%'
-         group by concat(a.order_number,a.customer_abbreviation,a.sales_department,a.salesman,a.account,b.pre_delivery_date,a.order_remarks,
-        b.item_number,b.small_po,b.inventory_name,b.colour,b.distribution_point,b.pack_id,b.coding_rules)
-
     </select>
 
 
@@ -152,8 +148,8 @@ ${ew.customSqlSegment} and  t.inventoryCcode not LIKE '19%'
            select b.sy_order_data_id as syOrderDataId,b.id as syOrderDataItemId ,a.order_number as orderNumber,b.item_number as itemNumber,b.small_po as smallPo,b.pk_org as pkOrg,a.order_date as orderDate,b.inventory_name as inventoryName,
          b.colour as colour,b.size as size,b.coding_rules as codingRules,b.quantity as quantity,a.business_type_value as businessTypeText,a.customer_order_number as customerOrderNumber,
            a.sales_type_text as salesTypeText,a.customer_abbreviation as customerAbbreviation,a.customer_name as customerName,b.surplus_num as surplusNum,DATE_FORMAT(b.pre_completion_date,'%Y-%m-%d') as preCompletionDate,
-           a.brand_side as brandSide,a.exchange_rate as exchangeRate,b.specification_and_model as specificationAndModel,a.account as account,b.inventory_code as inventoryCode,
-           b.distribution_point as distributionPoint,b.pack_id as packId,b.unit_price_including_tax as unitPriceIncludingTax,b.number_of_sets as numberOfSets,
+           a.brand_side as brandSide,a.exchange_rate as exchangeRate,b.specification_and_model as specificationAndModel,a.account as account,b.inventory_code as inventoryCode,b.weight as weight,
+           b.distribution_point as distributionPoint,b.pack_id as packId,b.unit_price_including_tax as unitPriceIncludingTax,b.number_of_sets as numberOfSets,b.guangpei_gate_width as guangpeiGateWidth,
            b.supplier_code as supplierCode,a.garment_nmb as garmentNmb,a.garment_factory as garmentFactory,DATE_FORMAT(b.pre_delivery_date,'%Y-%m-%d') as preDeliveryDate,b.box_number as boxNumber,
            a.whole_order_total as wholeOrderTotal,a.sales_department as salesDepartment,a.salesman as salesman,a.currency_text as currencyText,a.third_party as thirdParty,
             a.deposit_ratio as depositRatio,a.deposit as deposit,a.collaborative_route as collaborativeRoute,a.term_of_payment as termOfPayment,a.end_customer as endCustomer,

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

@@ -524,7 +524,7 @@ public class SyPackingListFabricController {
 			 SyPackingListFabric main =new SyPackingListFabric();
 			 List<SyPackingListFabricItem> items=new ArrayList<>();
 			 List<String> mainStrs=new ArrayList<>();
-			 for (int x=0;x<sheet.getLastRowNum()-1;x++){
+			 for (int x=0;x<=sheet.getLastRowNum();x++){
 				 Row row=sheet.getRow(x);
 				 if(x<2) {
 					 mainStrs.add(row.getCell(4)==null?"":row.getCell(4).toString());
@@ -533,7 +533,7 @@ public class SyPackingListFabricController {
 					 mainStrs.add(row.getCell(16)==null?"":row.getCell(16).toString());
 				 }else if(x==2){
 					 main =new SyPackingListFabric(mainStrs.toArray(new String[mainStrs.size()]));
-				 }else if(x>3){
+				 }else if(x>3){ 
 					 if(oConvertUtils.isEmpty(row.getCell(1))||row.getCell(1).toString().length()<10){//如果这一列为空就退出
 						 break;
 					 }

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

@@ -161,7 +161,7 @@ public class SyPackingListFabric implements Serializable {
 	@ApiModelProperty(value = "是否被参照(0:无,1:被预托书参照,2:被装箱单参照)")
 	private Integer isReference;
 
-	/**数组来源 1代表正常流程 2代表u8获取的数据 3代表云工厂推送的数据*/
+	/**数组来源 参照 拉取 导入 云工厂*/
 	@ApiModelProperty(value = "数组来源")
 	private String dataSource;
 
@@ -178,7 +178,7 @@ public class SyPackingListFabric implements Serializable {
 	private String isSucceed;
 
 	/**是否云工厂推送*/
-	@TableField(exist = false)
+	//@TableField(exist = false)
 	@ApiModelProperty(value = "是否云工厂推送")
 	private String whetherCloudFactoryPush;
 

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

@@ -417,6 +417,9 @@ public class SyPackingListFabricItem implements Serializable {
 			width="0";
 		}
 		if(gramWeight!=null&&!gramWeight.equals("")){
+			if(gramWeight.indexOf("克")>0){
+				gramWeight=strs[10].substring(0,strs[10].length()-1);
+			}
 			gramWeight2=new BigDecimal(gramWeight);
 		}else{
 			gramWeight="0";

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

@@ -125,7 +125,7 @@
         WHERE tailoring_Fabric_Id=#{value} AND del_flag=0) and the_Documents_State=1
     </select>
 
-    <select id="getOM_MOMaterials" resultType="java.util.HashMap" parameterType="java.util.HashMap">
+    <!--<select id="getOM_MOMaterials" resultType="java.util.HashMap" parameterType="java.util.HashMap">
         select * from OM_MOMaterials where
                     MoDetailsID = (select MODetailsID from om_modetails om1
                         inner join (SELECT om1.isosid,om2.cinvcode
@@ -133,6 +133,10 @@
                         on om1.MODetailsID=om2.MODetailsID
                         where  om1.MODetailsID=#{id}  and om1.cinvcode=#{cinvCode}) om2
                         on om1.isosid=om2.isosid and om1.cinvcode=om2.cinvcode)
+    </select>-->
+    <select id="getOM_MOMaterials" resultType="java.util.HashMap" parameterType="java.util.HashMap">
+        select * from OM_MOMaterials where
+                    MoDetailsID =  #{id}
     </select>
 
     <select id="getOM_MOMain" resultType="java.util.HashMap" parameterType="java.util.HashMap">

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

@@ -168,7 +168,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			entity.setSyPackingListFabricId(syPackingListFabric.getId());
 			entity.setInventoryQuantity(entity.getActualDeclaredQuantity());//入库数量=实际报关数量
 			if(entity.getIsAdd()>0){//大于1就是新增数据
-
 				//因为云工厂得修改时得停止调用前面接口
 				/*SyShippingDetailsItem s1 =syShippingDetailsItemMapper.selectById(entity.getSyShippingDetailsItemId());
 				//剩余数量-这次入库数量=新剩余数量
@@ -186,7 +185,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						entity.setTotalPrice(entity.getMeter().multiply(entity.getPrice()));//净重*单价
 					}
 				}
-
 				entity.setId(null);
 				syPackingListFabricItemMapper.insert(entity);
 			}else{
@@ -521,6 +519,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			String dateNo ="ML"+sf.format(System.currentTimeMillis())+getOne(queryWrapperCount).getId();//获取单据号
 			syPackingListFabric.setDocumentNo(dateNo);//单据号
 			syPackingListFabric.setDataSource("3");//云工厂推送的数据
+			syPackingListFabric.setWhetherCloudFactoryPush("1");//1代表是云工厂推送的
 			syPackingListFabric.setStatus("0");
 			syPackingListFabric.setDelFlag("0");
 			syPackingListFabricMapper.insert(syPackingListFabric);
@@ -1416,7 +1415,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					maps.get(account).add(id);
 				}
 			}
-			System.out.println("maps\n"+maps);
+			//System.out.println("maps\n"+maps);
 			for (String account : maps.keySet()) {//分成两类数据
 				//先插主表数据，然后根据主表id查询子表数据再添加
 				String sql ="select     \n" +

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

@@ -275,7 +275,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 	public List<SyPackingListTailoring> saveList(List<SyPackingListTailoring> syPackingListTailoring) {
 		List<SyPackingListTailoring> syPackingListTailorings=new ArrayList<>();
 		for (SyPackingListTailoring splt : syPackingListTailoring){
-			splt.setWhetherCloudFactoryPush("2");//2代表是云工厂推送的
+			splt.setWhetherCloudFactoryPush("1");//1代表是云工厂推送的
 			splt.setId(null);//id设置为null
 			syPackingListTailorings.add(saveMain(splt));//无sizeTable
 		}