增加取消提交

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

@@ -173,7 +173,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 		 if(oConvertUtils.isNotEmpty(customer)){
 			 queryWrapper.eq("t.customer",customer);//客户
 		 }
-		 /*if(customer!=null && !customer.trim().equals("")){
+		 /* if(oConvertUtils.isNotEmpty(customer)){
 			 queryWrapper.eq("t.customer",customer);//客户
 		 }*/
 		 Page<SyShippingDetailsVo> page = new Page<SyShippingDetailsVo>(pageNo, pageSize);
@@ -382,6 +382,49 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 	 	return result;
 	 }
 
+	 /**
+	  * 取消提交
+	  *
+	  * @param id
+	  * @return
+	  */
+	 @AutoLog(value = "预装箱单主表-取消提交")
+	 @ApiOperation(value="预装箱单主表-取消提交", notes="预装箱单主表-取消提交")
+	 @RequestMapping(value = "/cancelSubmit", method = {RequestMethod.GET})
+	 public Result<SyPreAssembledPackingList> cancelSubmit(@RequestParam(value = "id",required = true) String id) {
+		 Result<SyPreAssembledPackingList> result=new Result<>();
+		 try{
+			 if(oConvertUtils.isEmpty(id)){
+				 result.setMessage("未获取到id!");
+				 result.setSuccess(false);
+				 return result;
+			 }
+			 SyPreAssembledPackingList syPreAssembledPackingList2=syPreAssembledPackingListService.getById(id);
+			 if(oConvertUtils.isEmpty(syPreAssembledPackingList2)){
+				 result.setMessage("未找到该数据!");
+				 result.setSuccess(false);
+				 return result;
+			 }
+			 if(syPreAssembledPackingList2.getPushStatus().equals("1")){
+				 result.setMessage("已推送云工厂或已被下游参照!");
+				 result.setSuccess(false);
+				 return result;
+			 }
+			 syPreAssembledPackingList2.setStatus("2");//修改为取消提交状态
+			 boolean bool= syPreAssembledPackingListService.updateById(syPreAssembledPackingList2);//修改提交状态
+			 if(bool==true){
+				 result.setMessage("已取消提交!");
+				 result.setSuccess(true);
+				 result.setResult(syPreAssembledPackingList2);
+			 }
+		 }catch (Exception ex){
+			 ex.printStackTrace();
+			 log.error("取消提交失败：" + ex.getMessage());
+			 result.error500("取消提交失败:" + ex.getMessage());
+		 }
+		 return result;
+	 }
+
 	/**
 	 * 通过id删除
 	 *

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

@@ -58,6 +58,14 @@ public class SyPreAssembledPackingList implements Serializable {
 	@Excel(name = "客户", width = 25,needMerge = true,groupName = "主表信息")
 	@ApiModelProperty(value = "客户")
 	private String customer;
+	/**客户简称*/
+	//@Excel(name = "客户简称", width = 25,needMerge = true,groupName = "主表信息")
+	@ApiModelProperty(value = "客户简称")
+	private String customerAbbreviation;
+	/**客户编码*/
+	//@Excel(name = "客户编码", width = 25,needMerge = true,groupName = "主表信息")
+	@ApiModelProperty(value = "客户编码")
+	private String customerCode;
 	/**集装箱代号*/
 	@ApiModelProperty(value = "集装箱代号")
 	private String containerCode;

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

@@ -214,17 +214,10 @@ public class SyPreAssembledPackingListItem implements Serializable {
 //	@Excel(name = "工厂单价", width = 20)
 	@ApiModelProperty(value = "工厂单价")
 	private java.math.BigDecimal factoryUnitPrice;
+
 //	@Excel(name = "计量单位", width = 20)
 	@ApiModelProperty(value = "计量单位")
 	private String masterMetering;
-	/**数量（按合并规则累计）*/
-//	@Excel(name = "数量（按合并规则累计）", width = 20)
-/*	@ApiModelProperty(value = "数量（按合并规则累计）")
-	private java.math.BigDecimal totalQuantity;*/
-	/**客户简称*/
-	//@Excel(name = "客户简称", width = 20)
-	@ApiModelProperty(value = "客户简称")
-	private java.lang.String customerAbbreviation;
 
 	@ApiModelProperty(value = "分组id")
 	private String groupId;
@@ -240,19 +233,4 @@ public class SyPreAssembledPackingListItem implements Serializable {
 	@ApiModelProperty(value = "存货编码")
 	private java.lang.String inventoryCode;
 
-	/**客户简称*//*
-	@ApiModelProperty(value = "客户简称")
-	private java.lang.String customerAbbreviation;
-	*//**客户简称*//*
-	@ApiModelProperty(value = "客户简称")
-	private java.lang.String customerAbbreviation;
-	*//**客户简称*//*
-	@ApiModelProperty(value = "客户简称")
-	private java.lang.String customerAbbreviation;
-	*//**客户简称*//*
-	@ApiModelProperty(value = "客户简称")
-	private java.lang.String customerAbbreviation;
-	*//**客户简称*//*
-	@ApiModelProperty(value = "客户简称")
-	private java.lang.String customerAbbreviation;*/
 }

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

@@ -48,9 +48,8 @@
 			spur_or_sub_order,
 			factory_unit_price,
 			master_Metering,
-			group_id,
+			group_id
 			/*SUM(total_quantity) total_quantity,合计数量/件数*/
-			customer_abbreviation
 		FROM  sy_pre_assembled_packing_list_item
 		WHERE sy_pre_assembled_packing_list_id = #{value} AND del_flag = 0
 		GROUP BY group_id/*原本按照颜色进行分组 现改为按照分组id*/
@@ -72,7 +71,6 @@
 			sy_order_data_item.colour,/*颜色 s*/
 			sy_order_data_item.master_Metering,/*主计量*/
 		    sy_shipping_details_item.item_Number styleNo, /*款号 s*/
-          	sy_shipping_details_item.customer_Abbreviation customerAbbreviation, /*客户简称 s*/
            	sy_shipping_details_item.distribution_Point distributionPoint, /*分销点 s*/
             sy_shipping_details_item.inventory_Name inventoryName, /*存货名称 s*/
             sy_shipping_details_item.inventory_code  inventoryCode,/*存货code*/
@@ -149,49 +147,20 @@
 
 	<select id="pushData" resultType="org.jeecg.modules.spapl.vo.PackingLineVo" parameterType="java.lang.String">
         SELECT
-            '1001' tenantId/*租户ID*/,
-			sy_pre_assembled_packing_list_id packingHeaderId/*预装箱单主表id*/,
 			sort packingLineNum/*排序*/,
 			po_No pono/*poNo*/,
-			'' poId/*poId*/,
-            '' supplierNumber/*供应商编码*/,
-            '' supplierId/*供应商ID*/,
-            '' supplierTenantId/*供应商租户ID*/,
 			style_No styleNo/*styleNo*/,
 			item_Code featureCode1/*ITEM NO./SKU NO./UPC NO./PACKS CODE*/,
 			prepack_Sku	prepackSku/*PREPACK_SKU*/,
 			colour color/*颜色*/,
-    		'' itemId/*物料id*/,
-			'' itemAttrId/*物料特性*/,
-			inventory_Code itemCode/*物料名称*/,
+			inventory_Code itemCode/*物料code*/,
 			hod	hod	/*预发货日期*/,
 			size size/*尺码*/,
 			plan_Quantity planPackingQty/*计划装箱数量*/,
-			actual_Packing_Qty actualPackingQty /*实际装箱数量*/,
 			distribution_Point featureCode2/*分销点/DC/LABEL*/,
 			with_Code planSizeSpec/*计划配码规格*/,
-			'' actualPackingQty/*实际配码规格*/,
-			starting_Box_Number	startBoxNo/*起始箱号*/,
-			end_Case_Number endBoxNo/*结束箱号*/,
-			pieces_Box setQty/*件数/每箱*/,
-			box_Number cartons/*箱数*/,
-			total sets/*总件数*/,
-			outer_Box_Length boxLength/*外箱长度*/,
-			outer_Box_Width	boxWidth/*外箱宽度*/,
-			outer_Box_Height boxHeight/*外箱高度*/,
-			total_Volume totalCbm/*总体积*/,
-			net_Weight boxNetWeight/*净重/箱*/,
-			total_Net_Weight totalNetWeight/*总净重*/,
-			gross_Weight boxGrossWeight/*毛重/箱*/,
-			total_Gross_Weight totalGrossWeight/*总毛重*/,
-			net_Weight_Too netNetWeight/*NN.W净净重*/,
 			unit_Price unitPrice/*单价*/,
-			total_Price totalPrice/*总价*/,
-			'' packsCode/*Packs code*/,
-			'' dcNo/*DC NO*/,
-			'' skuNo/*SKU NO*/,
-			'' label/*标签*/,
-			'' distribution/*分销点*/
+			total_Price totalPrice/*总价*/
 		FROM sy_pre_assembled_packing_list_item
 		where sy_Pre_Assembled_Packing_List_Id=#{value}
     </select>

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

@@ -3,18 +3,19 @@
 <mapper namespace="org.jeecg.modules.spapl.mapper.SyPreAssembledPackingListMapper">
     <select id="selectSyShippingDetailsData" parameterType="java.lang.String" resultType="org.jeecg.modules.spapl.entity.SyPreAssembledPackingList">
         /*获取发运明细数据*/
-        select
-            id syDeclarationElementsId, /*发运明细主表id*/
-            chinese_Name productName,/*中文品名-->品名*/
-            pre_delivery_date preDeliveryDate, /*预发货日期 m*/
-            /*orderNumber 订单数据主表*/ /*订单号 orderNumberm  */
-            customer, /*客户 customer */
-            /*orderNumber 订单数据子表or发运明细子表*/  /*款号 itemNumber */
-            garment_Factory garmentFactory, /*成衣工厂 garmentFactory m*/
-            order_Type  orderType /*订单类型 m*/
-
-        from sy_shipping_details
-        where del_flag = 0 and id=#{value}
+        SELECT
+            sy_shipping_details.id AS syDeclarationElementsId, /*发运明细主表id*/
+            sy_order_data.id AS syDeclarationElementsId, /*订单数据主表id*/
+            sy_shipping_details.chinese_Name AS productName,/*中文品名-->品名*/
+            sy_shipping_details.pre_delivery_date AS preDeliveryDate, /*预发货日期 m*/
+            sy_shipping_details.customer AS customer, /*客户 customer */
+            sy_order_data.customer_Abbreviation AS customerAbbreviation, /*客户简称 customer */
+            sy_order_data.supplier_Code AS customerCode, /*客户编码 customer */
+            sy_shipping_details.garment_Factory AS garmentFactory, /*成衣工厂 garmentFactory m*/
+            sy_shipping_details.order_Type AS  orderType /*订单类型 m*/
+        FROM sy_shipping_details LEFT JOIN
+        sy_order_data ON sy_shipping_details.`sy_order_data_id`=sy_order_data.`id`
+        WHERE sy_shipping_details.del_flag = 0 AND sy_shipping_details.id=#{value}
 	</select>
 
     <select id="selectPage" resultType="org.jeecg.modules.spapl.vo.SyPreAssembledPackingListVo">
@@ -35,7 +36,10 @@
 			a.memo,/*备注*/
 			a.pre_delivery_date,/*预发货日期*/
 			a.order_type,/*订单类型*/
-			b.customer_abbreviation,/*客户简称*/
+			a.customer_abbreviation,/*客户简称*/
+			a.`update_time`,/*修改日期*/
+			a.`status`,/*单据状态*/
+			a.`push_Status`,/*推送状态*/
 			b.master_Metering,/*计量单位*/
 			SUM(b.total) total,/*件数*/
 			a.total_Boxes totalboxes,/*总箱数*/
@@ -54,6 +58,7 @@
         ON a.id=b.sy_pre_assembled_packing_list_id  AND b.del_flag='0'
         ${ew.customSqlSegment}
         GROUP BY a.id
+        ORDER BY a.`update_time` DESC
 	</select>
 
     <update id="deleteId" parameterType="java.lang.String">
@@ -63,22 +68,13 @@
     
     <select id="pushData" resultType="org.jeecg.modules.spapl.vo.PackingHeaderVo" parameterType="java.lang.String">
         SELECT
-            '1001' tenantId/*租户ID*/,
-             id packingHeaderNum/*单据号*/,
-            'CLOTHING' packingType /*计划装箱单类型*/,
-            'NEW' packingStatus /*计划装箱单头状态*/,
-            order_Number poNo/*订单号*/,
-            '' supplierNumber/*供应商编码*/,
-            '' supplierId/*供应商ID*/,
-            '' supplierTenantId/*供应商租户ID*/,
-            '' customerCode/*客户*/,
-            '' customerId/*客户ID*/,
-            '' customerTenantId/*客户租户ID*/,
-            size_Range sizeRange/*尺码范围*/,
-            item_Number styleNo/*款号*/,
-            product_Name productName/*品名*/,
-            create_By preparer/*创建人*/,
-            create_Time preparationTime/*创建时间*/
+            document_No as packingHeaderNum/*单据号*/,
+            'CLOTHING' as packingType /*计划装箱单类型*/,
+            'NEW' as packingStatus /*计划装箱单头状态*/,
+            order_Number as poNo/*订单号*/,
+            customerCode as customerCode/*客户编码*/,
+            create_By as preparer/*创建人*/,
+            create_Time as preparationTime/*创建时间*/
         FROM `sy_pre_assembled_packing_list`
         where id=#{value}
     </select>