装箱单成衣 编辑不能增加数量

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

@@ -133,9 +133,18 @@ public class SyPackingListTailoringController {
 		 //System.out.println("当前登录用户:"+((LoginUser)SecurityUtils.getSubject().getPrincipal()).getRealname());
 		 QueryWrapper<SyPreAssembledPackingListVo> queryWrapper =new QueryWrapper<>();//初始化
 		 queryWrapper.eq("a.del_flag","0");//默认查询未删除
-		 //客户简称	款号 分销点	预发货日期	小po	待添加查询条件
-		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getId())){
-			 queryWrapper.eq("a.id",syPreAssembledPackingListVo.getId());//查询id
+		 //客户简称 分销点	预发货日期	小po	待添加查询条件
+		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCustomerAbbreviation())){
+			 queryWrapper.eq("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation());//客户简称
+		 }
+		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDistributionPoint())){
+			 queryWrapper.eq("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());//分销点
+		 }
+		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getPreDeliveryDate())){
+			 queryWrapper.eq("b.hod",syPreAssembledPackingListVo.getPreDeliveryDate());//预发货日期
+		 }
+		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getSmallPo())){
+			 queryWrapper.eq("b.small_po",syPreAssembledPackingListVo.getSmallPo());//小po
 		 }
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){
 			 queryWrapper.eq("a.order_number",syPreAssembledPackingListVo.getOrderNumber());//订单号

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/entity/SyPackingListTailoring.java

@@ -82,6 +82,25 @@ public class SyPackingListTailoring implements Serializable {
 	/**总箱数*/
 	@ApiModelProperty(value = "总箱数")
 	private java.math.BigDecimal totalBoxes;
+	/**总件数*/
+	@ApiModelProperty(value = "总件数")
+	private java.math.BigDecimal total;
+	/**总净重*/
+	@Excel(name = "总净重", width = 15)
+	@ApiModelProperty(value = "总净重")
+	private java.math.BigDecimal totalNetWeight;
+	/**总毛重*/
+	@Excel(name = "总毛重", width = 15)
+	@ApiModelProperty(value = "总毛重")
+	private java.math.BigDecimal totalGrossWeight;
+	/**总体积*/
+	@Excel(name = "总体积", width = 15)
+	@ApiModelProperty(value = "总体积")
+	private java.math.BigDecimal totalVolume;
+	/**总价*/
+	@Excel(name = "总价", width = 15)
+	@ApiModelProperty(value = "总价")
+	private java.math.BigDecimal totalPrice;
 	/**集装箱代号*/
 	@ApiModelProperty(value = "集装箱代号")
 	private String containerCode;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/entity/SyPackingListTailoringItem.java

@@ -220,4 +220,10 @@ public class SyPackingListTailoringItem implements Serializable {
 	@Excel(name = "工厂单价", width = 20)
 	@ApiModelProperty(value = "工厂单价")
 	private java.math.BigDecimal factoryUnitPrice;
+
+
+	/**是否新增*/
+	@TableField(exist = false)
+	@ApiModelProperty(value = "是否新增")
+	private int isAdd;
 }

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

@@ -22,7 +22,7 @@ public interface SyPackingListTailoringItemMapper extends BaseMapper<SyPackingLi
 
 	public List<SyPackingListTailoringItem> queryId(String pId);
 
-	public List<SizeTable>size(String colour,String id);
+	public List<SizeTable>size(String group_id,String id);
 
 	public List<SizeTable> sizes(String id);
 }

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

@@ -87,10 +87,11 @@
 		net_weight_too net_weight_too,/*净净重*/
 		unit_price,
 		sum(total_price)  total_price,/*总价*/
-		with_code
+		with_code,
+		group_id
 	FROM  sy_packing_list_tailoring_item
 	WHERE sy_packing_list_tailoring_id =#{value} AND del_flag = 0
-	GROUP BY colour
+	GROUP BY group_id
 	</select>
 
 	<select id="size" resultType="org.jeecg.modules.spapl.entity.SizeTable">
@@ -99,7 +100,7 @@
 			FROM sy_packing_list_tailoring_item
 			LEFT JOIN sizetable ON sy_packing_list_tailoring_item.`size`=sizetable.`size`
 			OR sy_packing_list_tailoring_item.`size`=sizetable.`alias`
-		WHERE colour=#{colour} AND
+		WHERE group_id=#{group_id} AND
 		sy_packing_list_tailoring_id=#{id}
 		ORDER BY sizetable.num
 	</select>

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

@@ -35,11 +35,11 @@
          b.item_Code,
          b.distribution_Point,
          b.prepack_Sku,
-         SUM(b.total) total,
+/*         SUM(b.total) total,
          sum(b.total_Net_Weight)  totalNetWeight,
          sum(b.total_Gross_Weight)  totalGrossWeight,
          sum(b.total_Volume)  totalVolume,
-         sum(b.total_Price)  totalPrice,
+         sum(b.total_Price)  totalPrice,*/
          b.master_Metering,
          b.inventory_Name,
          b.colour,

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

@@ -47,7 +47,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			item.setSyPackingListTailoringId(pid);//获取主表id
 			BigDecimal boxNumber1=item.getBoxNumber();//获取箱数
 			box=box.add(boxNumber1);//合计
-			item.setGroupId(oConvertUtils.id());
+			item.setGroupId(oConvertUtils.id());//分组随机id
 			item.setDelFlag("0");//默认为未删除
 			for (SizeTable size : sizes){
 				SyPackingListTailoringItem item1=item;
@@ -100,13 +100,16 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				//item.setSyDeclarationElementsItemId(size.getItemId());//获取到发运明细子表id
 				item1.setId(size.getItemId());//从尺码表中获取到id
 				// 获取到预装箱单子表id
-				String syPreAssembledPackingListItemId=syPackingListTailoringItemMapper.selectById(item1.getId()).getSyPreAssembledPackingListItemId();
-				item1.setSyPreAssembledPackingListItemId(syPreAssembledPackingListItemId);
-				int row=syPackingListTailoringItemMapper.updateById(item1);//如果没修改成功就是新增数据
-				if(row==0){//如果为0就添加数据
+				SyPackingListTailoringItem splt=syPackingListTailoringItemMapper.selectById(item1.getId());
+				//获取预装箱单子表id
+				item1.setSyPreAssembledPackingListItemId(splt.getSyPreAssembledPackingListItemId());
+				if(item.getIsAdd()>0){
 					item1.setSyPackingListTailoringId(pid);
+					item1.setId(oConvertUtils.id());//获取到随机id
 					syPackingListTailoringItemMapper.insert(item1);
+					continue;
 				}
+				syPackingListTailoringItemMapper.updateById(item1);//如果没修改成功就是新增数据
 			}
 		}
 		return box;
@@ -225,7 +228,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		List<SizeTable> size=syPackingListTailoringItemMapper.sizes(syPackingListTailoring.getId());
 		syPackingListTailoring.setSizeTables(size);//获取id
 		for (SyPackingListTailoringItem item : items){
-			item.setSizeTables(syPackingListTailoringItemMapper.size(item.getColour(),item.getSyPackingListTailoringId()));
+			item.setSizeTables(syPackingListTailoringItemMapper.size(item.getGroupId(),item.getSyPackingListTailoringId()));
 		}
 		syPackingListTailoring.setSyPackingListTailoringItemList(items);
 		return syPackingListTailoring;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/vo/SyPackingListTailoringVo.java

@@ -47,6 +47,10 @@ public class SyPackingListTailoringVo {
 	/**尺码范围*/
 	@ApiModelProperty(value = "尺码范围")
 	private String sizeRange;
+	/**客户*/
+	@ApiModelProperty(value = "客户")
+	@Excel(name = "客户", width = 15)
+	private String customer;
 	/**客户简称*/
 	@ApiModelProperty(value = "客户简称")
 	private String customerAbbreviation;