成衣尺码排序

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

@@ -960,7 +960,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                     sysGroupCount.setTotalGrossWeight(sysGroupCount.getTotalGrossWeight().add(sy.getTotalGrossWeight()));
                     sysGroupCount.setTotalNetWeight(sysGroupCount.getTotalNetWeight().add(sy.getTotalNetWeight()));
                     sysGroupCount.setTotalVolume(sysGroupCount.getTotalVolume().add(sy.getTotalVolume()));
-                    String [] strs=sy.str().split(",");
+                    String [] strs=sy.str().split(",");//切割
                     for (int i=0; i<strs.length;i++){
                         Cell cell = row.createCell(i);//横向
                         cell.setCellStyle(cellStyle2);
@@ -1407,27 +1407,6 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                             System.out.println("字段\t"+cell.getStringCellValue()+"\t"+i);
                         }
                     }else{
-                        /*if((i>7&&i<row.getLastCellNum()-13)||i==row.getLastCellNum()-4){
-                            if(cell==null){
-                                throw new JeecgBootException("第"+num+"页的"+"第"+(x+1)+"行的"+
-                                        sheet.getRow(0).getCell(i).getStringCellValue()+"未填值！");
-                            }
-                            cell.setCellType(CellType.STRING);//获取的都转换成String
-                            if(cell.getStringCellValue().length()<1&&!nums.contains(i)){
-                                throw new JeecgBootException("第"+num+"页的"+"第"+(x+1)+"行的"+
-                                        sheet.getRow(0).getCell(i).getStringCellValue()+"未填值！");
-                            }
-                            strs2.add(cell.getStringCellValue());
-
-                        }else{
-                            if(cell==null){
-                                strs.add("");
-                            }else{
-                                cell.setCellType(CellType.STRING);//获取的都转换成String
-                                strs.add(cell.getStringCellValue());
-                            }
-                        }*/
-
                         if((i>7&&i<row.getLastCellNum()-13)||i==row.getLastCellNum()-4){
                             if(cell==null){
                                 strs2.add("");
@@ -1564,7 +1543,6 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                         }
                     }
                 }
-                //System.out.println("strs2\t"+strs2);
                 if(x>0){
                     BigDecimal total=new BigDecimal("0");
                     for (String str : strs2){
@@ -1590,6 +1568,10 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
     }
 
 
+    public String updateAllExcelData(){
+
+        return "";
+    }
 
 
 }

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

@@ -193,6 +193,10 @@ public class SyPreAssembledPackingList implements Serializable {
 	//委外采购Id 主
 	private String ompoId;
 
+	//是否为excel导入
+	@ApiModelProperty(value = "是否为excel导入(0:否,1:是")
+	private Integer isExcel;
+
 	//子表集合
 	@TableField(exist = false)
 	@ApiModelProperty(value = "子表集合")

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

@@ -351,6 +351,7 @@ public class SyPreAssembledPackingListItem implements Serializable {
 				planSize+=parsms3[i]+":"+(boxNumber.intValue()*sizeTable.getProportion())+"+";
 				sizeTable.setItemId(parsms2[parsms2.length-1].split(",")[i]);//发运明细子表id
 				sizeTables.add(sizeTable);
+				System.out.println(sizeTable.getSize()+"\t"+sizeTable.getItemId());
 			}
 			this.planSize=planSize.substring(0,planSize.length()-1);
 			this.piecesBox=new BigDecimal(piecesBox);//每箱件数
@@ -361,6 +362,15 @@ public class SyPreAssembledPackingListItem implements Serializable {
 			this.totalVolume=this.boxNumber.multiply(this.outerBoxLength).multiply(this.outerBoxWidth).multiply(this.outerBoxHeight).divide(new BigDecimal(1000000));
 		}catch (Exception e){
 			e.printStackTrace();
+			//0b99082276e342ac930a0acb161b47b4,
+			// c36f97201a0f493994afd0786eed1d82,
+			// ce8f22e49b2f466bb877d273b6b7e61a,
+			//588726fc0fcf460f90df2dae21b8c226,
+			// 83721612e5424a1780963161133d870a,
+			// 3e09b3aa0d864eea8b5d0f9b0deec944
+
+			//S	M	L	XL	2XL	3XL
+
 			//System.out.println(e.getMessage());
 		}
 	}

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

@@ -148,7 +148,7 @@
 		OR sy_pre_assembled_packing_list_item.`size`=sizetable.`alias`
 		WHERE sy_pre_assembled_packing_list_id =#{value}
 		 and sy_pre_assembled_packing_list_item.del_flag=0
-		ORDER BY sizetable.num
+		ORDER BY sy_order_data_item_id
 	</select>
 
 	<!--参照发育明细获取id的所有尺码并排序-->
@@ -157,7 +157,7 @@
 		sizetable.alias,
 		sy_shipping_details_item.shipment_Quantity quantity,
 		sy_shipping_details_item.shipment_Quantity/sy_shipping_details_item.box_Number proportion,
-		sy_shipping_details_item.id itemId
+		sy_shipping_details_item.id itemId,
 		FROM sy_shipping_details_item
 		LEFT JOIN sizetable ON sy_shipping_details_item.`size`=sizetable.`size`
 		OR sy_shipping_details_item.`size`=sizetable.`alias`
@@ -180,7 +180,7 @@
 			OR sy_pre_assembled_packing_list_item.`size`=sizetable.`alias`
 		WHERE group_id=#{groupId} and sy_pre_assembled_packing_list_id=#{value2}
 		 and sy_pre_assembled_packing_list_item.del_flag=0
-		order by sizetable.num
+		order by sy_order_data_item_id
 	</select>
 
 

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

@@ -220,4 +220,13 @@
     ORDER BY a.document_no DESC) AS t
     ${ew.customSqlSegment}
     </select>
+
+    <select id="getExcelId"  >
+        SELECT  DISTINCT sy_pre_assembled_packing_list_id FROM
+        sy_pre_assembled_packing_list_item a LEFT JOIN
+        sy_shipping_details_item b
+        ON a.sy_declaration_elements_item_id=b.id
+        WHERE a.size!=b.size
+    </select>
+
 </mapper>

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

@@ -516,21 +516,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 	public boolean add(List<SyPreAssembledPackingList> items1) {
 		boolean bool=false;
 		try{
-			/*int num=1;
-			String strs="";
-			for (SyPreAssembledPackingList item : items1){
-				QueryWrapper queryWrapper=new QueryWrapper();
-				queryWrapper.eq("sy_Declaration_Elements_Id",item.getSyDeclarationElementsId());
-				SyPreAssembledPackingList item2=new SyPreAssembledPackingList();
-				if(item2!=null){
-					strs+="第"+num+"页的已被预装箱单参照，请勿重复操作\n";
-				}
-				num++;
-			}
-			if(!strs.equals("")){
-				throw new JeecgBootException(strs);
-			}*/
-			//System.out.println("原单据数量,已参照数量,本次数量");
+
 			for(SyPreAssembledPackingList syPreAssembledPackingList : items1){
 				SimpleDateFormat sf= new SimpleDateFormat("yyyyMMdd");
 				QueryWrapper<SyPreAssembledPackingList> queryWrapperCount=new QueryWrapper<>();
@@ -549,7 +535,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				syPreAssembledPackingList.setTotalPrice(new BigDecimal("0"));
 				syPreAssembledPackingListMapper.insert(syPreAssembledPackingList);//往主表添加数据
 				List<SyPreAssembledPackingListItem> items=syPreAssembledPackingList.getSyPreAssembledPackingListItemList();
-				System.out.println("items的长度\t"+items.size());
+				//System.out.println("items的长度\t"+items.size());
 				for (SyPreAssembledPackingListItem item : items){
 				//	System.out.println("净重\t"+item.getTotalNetWeight());
 					syPreAssembledPackingList.setTotalBoxes(syPreAssembledPackingList.getTotalBoxes().add(item.getBoxNumber()));
@@ -558,6 +544,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 					syPreAssembledPackingList.setTotalVolume(syPreAssembledPackingList.getTotalVolume().add(item.getTotalVolume()));
 					List<SizeTable> sizes=item.getSizeTables();//获取尺码表信息
 					item.setSyPreAssembledPackingListId(syPreAssembledPackingList.getId());//获取主表id
+					syPreAssembledPackingList.setIsExcel(1);//设置成1
 					BigDecimal boxNumber1=item.getBoxNumber();//获取箱数
 					item.setActualPackingQty(item.getTotal());//计划装箱数量
 					item.setGroupId(org.jeecg.modules.system.util.oConvertUtils.getId());//分组id
@@ -573,22 +560,19 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 						syPreAssembledPackingList.setTotal(syPreAssembledPackingList.getTotal().add(boxNumber));
 						item1.setActualPackingQty(size.getQuantity());//获取该尺码计划装箱数量
 						item1.setRemainingQuantity(boxNumber);//剩余数量
-						item1.setSize(size.getSize());//获取尺码
 						item1.setSyDeclarationElementsItemId(size.getItemId());//获取到发运明细子表id
 						item1.setSort(size.getNum());//获取序号
 						item1.setId(oConvertUtils.id());//获取到随机id
-						//syPreAssembledPackingListItemMapper.insert(item1);//添加子表数据
 						//获取发育明细数据
 						SyShippingDetailsItem syItem=syShippingDetailsItemMapper.selectById(item1.getSyDeclarationElementsItemId());
 						if(syItem!=null){
+							System.out.println(item1.getSize()+"\t"+item1.getSyDeclarationElementsItemId());
 							item1.setUnitPrice(syItem.getSalesUnitPrice());//获取销售单价
 							item1.setFactoryUnitPrice(new BigDecimal(syItem.getFactoryUnitPrice()==null?"0":syItem.getFactoryUnitPrice()));//工厂单价
 							item1.setInventoryName(syItem.getInventoryName());//存货名称
 							item1.setAcSetNo(syItem.getAccount());//获取账套号
 							item1.setHod(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(syItem.getPreDeliveryDate()));//预发货日期
 							item1.setTotalPrice(item1.getTotal().multiply(item1.getUnitPrice()));//获取总价		箱数*单价-->件数*单价
-							System.out.println("单价\t"+item1.getUnitPrice());
-							System.out.println("件数\t"+item1.getTotal());
 							item1.setOrderNumber(syItem.getOrderNumber());//获取订单号
 							item1.setWithCode(syItem.getCodingRules());//配码规则
 							item1.setSpurOrSubOrder(syItem.getPurOrSubOrder());//获取采购委外订货号

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

@@ -634,7 +634,6 @@ public class SyPackingListTailoringController {
 				 Sheet sheet=(Sheet) sheets.next();
 				 SyPackingListTailoring sypres=items.get(num);
 				 workbook.setSheetName(num,"装箱单"+(num+1));
-				 System.out.println("workbook\t"+workbook.getSheetName(num));
 				 num--;
 				 List<SyPackingListTailoringItem> list=sypres.getSyPackingListTailoringItemList();
 				 if(list==null){

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

@@ -134,7 +134,7 @@
 			OR sy_packing_list_tailoring_item.`size`=sizetable.`alias`
 		WHERE group_id=#{group_id} AND
 		sy_packing_list_tailoring_id=#{id}
-		ORDER BY sizetable.num
+		ORDER BY sy_order_data_item_id
 	</select>
 
 	<select id="sizes" resultType="org.jeecg.modules.spapl.entity.SizeTable">
@@ -143,6 +143,6 @@
 		 LEFT JOIN sizetable ON sy_packing_list_tailoring_item.`size`=sizetable.`size`
 		 OR sy_packing_list_tailoring_item.`size`=sizetable.`alias`
 		 WHERE sy_packing_list_tailoring_id =#{value}
-		 ORDER BY sizetable.num
+		 ORDER BY sy_order_data_item_id
 	</select>
 </mapper>