成衣导出调整

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

@@ -306,16 +306,9 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 	@Transactional
 	public synchronized SyPreAssembledPackingList saveMain2(SyPreAssembledPackingList syPreAssembledPackingList) {
 		List<SyPreAssembledPackingListItem> items=syPreAssembledPackingList.getSyPreAssembledPackingListItemList();
-
 		SimpleDateFormat sf = new SimpleDateFormat("yyMMddHHmmssSSS");
-
-		/*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();
 		syPreAssembledPackingList.setDocumentNo(dateNo);//订单号-->单据号
-
 		syPreAssembledPackingList.setDelFlag("0");//删除状态默认为0
 		syPreAssembledPackingList.setPushStatus("0");//推送状态默认为0
 		if(oConvertUtils.isEmpty(syPreAssembledPackingList.getStatus())||!syPreAssembledPackingList.getStatus().equals("1")){
@@ -327,7 +320,6 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				syPreAssembledPackingList.setSyOrderDataId(syShippingDetails.getSyOrderDataId());
 			}
 		}
-
 		syPreAssembledPackingListMapper.insert(syPreAssembledPackingList);//往主表添加数据
 		if(syPreAssembledPackingList.getSyPreAssembledPackingListItemList()!=null){
 			BigDecimal box=add(syPreAssembledPackingList.getSyPreAssembledPackingListItemList(),syPreAssembledPackingList.getId());

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

@@ -593,7 +593,10 @@ public class SyPackingListTailoringController {
 			// QueryWrapper<SyPackingListTailoring> queryWrapper = QueryGenerator.initQueryWrapper(syPackingListTailoring, request.getParameterMap());
 			 //queryWrapper.eq("del_flag","0");
 			// queryWrapper.orderByDesc(	"create_time");//创建时间倒序
+			 long startTime = System.currentTimeMillis();
 			 List<SyPackingListTailoringVo> syPackingListTailoringVos = syPackingListTailoringService.selectList(page,queryWrapper).getRecords();
+			 long endTime = System.currentTimeMillis();
+			 System.out.println("全程的时间：" + (endTime - startTime) + "ms");
 			 if(syPackingListTailoringVos.size()==0){
 				 result.setResult(null);
 				 result.setMessage("导出失败！没有查询到数据");
@@ -688,7 +691,7 @@ public class SyPackingListTailoringController {
 					 Row row2 = sheet.createRow(4);
 					 for (int x=0;x<params.length;x++){
 						 Cell cell = row2.createCell(x);//横向
-						 if(x>8&&x<params.length-19){
+						 if(x>8&&x<params.length-18){
 							 cell.setCellStyle(cellStyle);
 						 }else{
 							 cell.setCellStyle(cellStyle2);
@@ -703,7 +706,7 @@ public class SyPackingListTailoringController {
 							 cell.setCellStyle(cellStyle2);
 							 cell.setCellValue(i+1);//序号
 							 continue;
-						 } else if(y>8&&y<params.length-18){
+						 } else if(y>8&&y<params.length-17){
 							 cell.setCellStyle(cellStyle);
 							 cell.setCellValue(params[y]);//输入值
 						 }else{
@@ -711,11 +714,11 @@ public class SyPackingListTailoringController {
 							 cell.setCellValue(params[y]);//输入值
 						 }
 
-						 if(y>8&&y<params.length-18){
+						 if(y>8&&y<params.length-17){
 							 if(!params[y].equals("null")&&!params[y].equals("")){
 								 cell.setCellValue(Integer.parseInt(params[y]));//
 							 }
-						 }else if(y==params.length-18||y==params.length-17||y==params.length-14||y==params.length-13||(y>params.length-12&&y<params.length)){
+						 }else if(y==params.length-17||y==params.length-16||y==params.length-13||y==params.length-12||(y>params.length-11&&y<params.length)){
 							 if(!params[y].equals("null")&&!params[y].equals("")){
 								 cell.setCellValue(Double.parseDouble(params[y]));//
 							 }
@@ -772,7 +775,10 @@ public class SyPackingListTailoringController {
 		 }
 		 Result result=new Result();
 		 try{
+			 long startTime = System.currentTimeMillis();
 			 List<SyPackingListTailoringVo> syPackingListTailoringVos = syPackingListTailoringService.selectList(page,queryWrapper).getRecords();
+			 long endTime = System.currentTimeMillis();
+			 System.out.println("全程的时间：" + (endTime - startTime) + "ms");
 			 if(syPackingListTailoringVos.size()==0){
 				 result.setResult(null);
 				 result.setMessage("导出失败！没有查询到数据");