修改单据号取值，导出减去集装箱代号

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

@@ -936,20 +936,20 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
             sysCount.setTotalVolume(new BigDecimal("0"));
             for (int i=0; i < mains.size(); i++) {//循环
                 String depositaryReceiptNo=mains.get(i).getDepositaryReceiptNo()==null?"空":mains.get(i).getDepositaryReceiptNo();//预托书号
-                String containerCode=mains.get(i).getContainerCode()==null?"空":mains.get(i).getContainerCode();//集装箱代号
+                String containerNumber=mains.get(i).getContainerNumber()==null?"空":mains.get(i).getContainerNumber();//集装箱代号-->改为集装箱号
                 sysCount.setTotal(sysCount.getTotal().add(mains.get(i).getTotal()));
                 sysCount.setTotalBoxes(sysCount.getTotalBoxes().add(mains.get(i).getTotalBoxes()));
                 sysCount.setTotalGrossWeight(sysCount.getTotalGrossWeight().add(mains.get(i).getTotalGrossWeight()));
                 sysCount.setTotalNetWeight(sysCount.getTotalNetWeight().add(mains.get(i).getTotalNetWeight()));
                 sysCount.setTotalVolume(sysCount.getTotalVolume().add(mains.get(i).getTotalVolume()));
-                if(maps.containsKey(depositaryReceiptNo+containerCode)){
-                    List<SyPreAssembledPackingListVo> sys= (List<SyPreAssembledPackingListVo>) maps.get(depositaryReceiptNo+containerCode);
+                if(maps.containsKey(depositaryReceiptNo+containerNumber)){
+                    List<SyPreAssembledPackingListVo> sys= (List<SyPreAssembledPackingListVo>) maps.get(depositaryReceiptNo+containerNumber);
                     sys.add(mains.get(i));
-                    maps.put(depositaryReceiptNo+containerCode,sys);
+                    maps.put(depositaryReceiptNo+containerNumber,sys);
                 }else{
                     List<SyPreAssembledPackingListVo> sys=new ArrayList<>();
                     sys.add(mains.get(i));
-                    maps.put(depositaryReceiptNo+containerCode,sys);
+                    maps.put(depositaryReceiptNo+containerNumber,sys);
                 }
             }
             int num=0;
@@ -1171,6 +1171,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
         while (sheets.hasNext()){
             Sheet sheet=(Sheet) sheets.next();
             SyPreAssembledPackingList sypres=items.get(num);
+            System.out.println("装箱单名字\t"+sypres.getDocumentNo());
             workbook.setSheetName(num,sypres.getDocumentNo());
             num--;
             List<SyPreAssembledPackingListItem> list=sypres.getSyPreAssembledPackingListItemList();

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

@@ -209,11 +209,13 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 	public synchronized SyPreAssembledPackingList saveMain2(SyPreAssembledPackingList syPreAssembledPackingList) {
 		List<SyPreAssembledPackingListItem> items=syPreAssembledPackingList.getSyPreAssembledPackingListItemList();
 
-		SimpleDateFormat sf= new SimpleDateFormat("yyyyMMdd");
+		SimpleDateFormat sf = new SimpleDateFormat("yyMMddHHmmss");
+
+		/*SimpleDateFormat sf= new SimpleDateFormat("yyyyMMdd");
 		QueryWrapper<SyPreAssembledPackingList> queryWrapperCount=new QueryWrapper<>();
 		queryWrapperCount.like("create_time", new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis()));
-		queryWrapperCount.select("lpad(count(0)+1,6,0) as id");
-		String dateNo ="YCY"+sf.format(System.currentTimeMillis())+getOne(queryWrapperCount).getId();
+		queryWrapperCount.select("lpad(count(0)+1,6,0) as id");*/
+		String dateNo ="YCY"+sf.format(System.currentTimeMillis());//+getOne(queryWrapperCount).getId();
 		syPreAssembledPackingList.setDocumentNo(dateNo);//订单号-->单据号
 
 		syPreAssembledPackingList.setDelFlag("0");//删除状态默认为0
@@ -250,10 +252,6 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 		}
 		List<SyPreAssembledPackingListItem> items=syPreAssembledPackingList.getSyPreAssembledPackingListItemList();
 		syPreAssembledPackingListMapper.updateById(syPreAssembledPackingList);//修改主表数据
-
-		//根据主表id获取所有的子表信息
-		//问题：这样会查询到上次就已经删除的数据,数据会乱
-		//思路：让上次被删除的数据避免被重用
 		List<SyPreAssembledPackingListItem> items2=syPreAssembledPackingListItemMapper.selectAll(syPreAssembledPackingList.getId());
 		for(SyPreAssembledPackingListItem item : items2){//要根据这个去改变对应发运明细的剩余数量
 			if(item.getSyDeclarationElementsItemId()==null){
@@ -523,11 +521,8 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 		try{
 
 			for(SyPreAssembledPackingList syPreAssembledPackingList : items1){
-				SimpleDateFormat sf= new SimpleDateFormat("yyyyMMdd");
-				QueryWrapper<SyPreAssembledPackingList> queryWrapperCount=new QueryWrapper<>();
-				queryWrapperCount.like("create_time", new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis()));
-				queryWrapperCount.select("lpad(count(0)+1,6,0) as id");
-				String dateNo ="YCY"+sf.format(System.currentTimeMillis())+getOne(queryWrapperCount).getId();
+				SimpleDateFormat sf = new SimpleDateFormat("yyMMddHHmmss");
+				String dateNo ="YCY"+sf.format(System.currentTimeMillis()) ;
 				syPreAssembledPackingList.setDocumentNo(dateNo);//订单号-->单据号
 				syPreAssembledPackingList.setDelFlag("0");//删除状态默认为0
 				syPreAssembledPackingList.setPushStatus("0");//推送状态默认为0

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

@@ -91,12 +91,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	@Override
 	@Transactional
 	public synchronized SyPackingListFabric saveMain(SyPackingListFabric syPackingListFabric) {
-		SimpleDateFormat sf= new SimpleDateFormat("yyMMdd");
-		QueryWrapper<SyPackingListFabric> queryWrapperCount=new QueryWrapper<>();
-		queryWrapperCount.like("create_time", new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis()));
-		queryWrapperCount.eq("is_U8_Data","0");//判断是不是面料
-		queryWrapperCount.select("lpad(count(0)+1,6,0) as id");
-		String dateNo ="ML"+sf.format(System.currentTimeMillis())+getOne(queryWrapperCount).getId();//获取单据号
+		SimpleDateFormat sf = new SimpleDateFormat("yyMMddHHmmss");
+		String dateNo ="ML"+sf.format(System.currentTimeMillis());//获取单据号
 		syPackingListFabric.setDelFlag("0");
 		syPackingListFabric.setStatus("0");
 		syPackingListFabric.setDocumentNo(dateNo);//单据号
@@ -392,12 +388,13 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	public void saveList(List<SyPackingListFabric> syPackingListTailorings) {
 		for (SyPackingListFabric syPackingListFabric : syPackingListTailorings){
 			syPackingListFabric.setId(null);
-			SimpleDateFormat sf= new SimpleDateFormat("yyMMdd");
+			SimpleDateFormat sf = new SimpleDateFormat("yyMMddHHmmss");
+			/*SimpleDateFormat sf= new SimpleDateFormat("yyMMdd");
 			QueryWrapper<SyPackingListFabric> queryWrapperCount=new QueryWrapper<>();
 			queryWrapperCount.like("create_time", new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis()));
 			queryWrapperCount.eq("is_U8_Data","0");//判断是不是面料
-			queryWrapperCount.select("lpad(count(0)+1,6,0) as id");
-			String dateNo ="ML"+sf.format(System.currentTimeMillis())+getOne(queryWrapperCount).getId();//获取单据号
+			queryWrapperCount.select("lpad(count(0)+1,6,0) as id");*/
+			String dateNo ="ML"+sf.format(System.currentTimeMillis());//获取单据号
 			syPackingListFabric.setDocumentNo(dateNo);//单据号
 			syPackingListFabric.setDataSource("3");//云工厂推送的数据
 			syPackingListFabric.setWhetherCloudFactoryPush("1");//1代表是云工厂推送的
@@ -491,12 +488,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		boolean bool=false;
 		try{
 			for (String str : maps.keySet()){
-				SimpleDateFormat sf= new SimpleDateFormat("yyMMdd");
-				QueryWrapper<SyPackingListFabric> queryWrapperCount=new QueryWrapper<>();
-				queryWrapperCount.like("create_time", new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis()));
-				queryWrapperCount.eq("is_U8_Data","0");//判断是不是面料
-				queryWrapperCount.select("lpad(count(0)+1,6,0) as id");
-				String dateNo ="ML"+sf.format(System.currentTimeMillis())+getOne(queryWrapperCount).getId();//获取单据号
+				SimpleDateFormat sf = new SimpleDateFormat("yyMMddHHmmss");
+				String dateNo ="ML"+sf.format(System.currentTimeMillis());//获取单据号
 				SyPackingListFabric syPackingListFabric =maps.get(str);
 				//syPackingListFabric.setGarmentFactory(str);//成衣工厂
 				syPackingListFabric.setDocumentNo(dateNo);//单据号

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

@@ -1391,12 +1391,12 @@ public class SyPackingListTailoringController {
 		 return  result;
 	 }
 
-	 @AutoLog(value = "获取excel导入的数据")
+	/* @AutoLog(value = "获取excel导入的数据")
 	 @ApiOperation(value="获取excel导入的数据", notes="获取excel导入的数据")
 	 @RequestMapping(value = "/getExcelId", method = {RequestMethod.POST})
 	 public Result getExcelId(){
 		 String[] ids=syPackingListTailoringService.getExcelId();
 		 return Result.ok(ids);
-	 }
+	 }*/
 
 }

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

@@ -227,11 +227,11 @@ public class SyPackingListTailoring implements Serializable {
 		customerAbbreviation=params[3];// 客户简称
 		depositaryReceiptNo=params[4];//预托书号
 		containerNumber=params[5];//集装箱号
-		containerCode=params[6];//集装箱代号
-		garmentFactory=params[7];//成衣工厂
-		smallPo=params[8];//小po
-		distributionPoint=params[9];// 分销点
-		elementsId=params[10];// 申报要素ID
-		syPreAssembledPackingListId=params[11];// 主表id
+		//containerCode=params[6];//集装箱代号
+		garmentFactory=params[6];//成衣工厂
+		smallPo=params[7];//小po
+		distributionPoint=params[8];// 分销点
+		elementsId=params[9];// 申报要素ID
+		syPreAssembledPackingListId=params[10];// 主表id
 	}
 }

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

@@ -106,11 +106,12 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 
 	//获取流水号
 	String randomStr(){
-		SimpleDateFormat sf= new SimpleDateFormat("yyyyMMdd");
+		SimpleDateFormat sf = new SimpleDateFormat("yyMMddHHmmss");
+		/*SimpleDateFormat sf= new SimpleDateFormat("yyyyMMdd");
 		QueryWrapper<SyPackingListTailoring> queryWrapperCount=new QueryWrapper<>();
 		queryWrapperCount.like("create_time", new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis()));
-		queryWrapperCount.select("lpad(count(0)+1,6,0) as id");
-		return  "CY"+sf.format(System.currentTimeMillis())+getOne(queryWrapperCount).getId();
+		queryWrapperCount.select("lpad(count(0)+1,6,0) as id");*/
+		return  "CY"+sf.format(System.currentTimeMillis());
 	}
 
 	@Override