预装箱单增加新的导出

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

@@ -916,10 +916,239 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 
     }
 
-    protected static void refreshSheet(Workbook workbook,List<SyPreAssembledPackingListVo> mains ) {
+    @AutoLog(value = "预装箱单列表导出")
+    @ApiOperation(value="预装箱单列表导出", notes="预装箱单列表导出")
+    @RequestMapping(value = "/exportXls3")
+    public Result<SyPreAssembledPackingList> exportXls3(HttpServletRequest request,HttpServletResponse response,SyPreAssembledPackingListVo syPreAssembledPackingListVo,
+                                                        String stratDate,
+                                                        String endDate) {
+        QueryWrapper<SyPreAssembledPackingListVo> queryWrapper =new QueryWrapper<>();//初始化
+        queryWrapper.eq("a.del_flag","0");//默认查询未删除
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getId())){//查询id
+            queryWrapper.eq("a.id",syPreAssembledPackingListVo.getId());
+        }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){//订单号
+            queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber());
+        }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getGarmentFactory())){//成衣工厂
+            queryWrapper.like("b.garment_Factory",syPreAssembledPackingListVo.getGarmentFactory());
+        }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDocumentNo())){//单据号
+            queryWrapper.like("a.document_No",syPreAssembledPackingListVo.getDocumentNo());
+        }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getItemNumber())){//款号
+            queryWrapper.like("a.item_number",syPreAssembledPackingListVo.getItemNumber());
+        }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getProductName())){//品名
+            queryWrapper.like("a.product_Name",syPreAssembledPackingListVo.getProductName());
+        }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateBy())){//创建人
+            queryWrapper.like("a.create_by",syPreAssembledPackingListVo.getCreateBy());
+        }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateTime())){//创建时间
+            queryWrapper.like("a.create_time",syPreAssembledPackingListVo.getCreateTime());
+        }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDepositaryReceiptNo())){//预托书号
+            queryWrapper.like("a.depositary_Receipt_No",syPreAssembledPackingListVo.getDepositaryReceiptNo());
+        }
+        // 小po 分销点
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getSmallPo())){//小po
+            queryWrapper.like("b.small_Po",syPreAssembledPackingListVo.getSmallPo());
+        }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDistributionPoint())){//分销点
+            queryWrapper.like("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());
+        }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getStatus())){//状态
+            queryWrapper.like("a.status",syPreAssembledPackingListVo.getStatus());
+        }
+        //预发货日期
+        if(oConvertUtils.isNotEmpty(stratDate)){//起始
+            queryWrapper.ge("b.hod",stratDate);
+        }
+        if(oConvertUtils.isNotEmpty(endDate)){//结束
+            queryWrapper.le("b.hod",endDate);
+        }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getAcSetNo())){//账套号
+            queryWrapper.like("b.ac_Set_No",syPreAssembledPackingListVo.getAcSetNo());
+        }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getIsReference())){//是否被参照
+            if(syPreAssembledPackingListVo.getIsReference().equals(0)){
+                queryWrapper.eq("a.is_Reference",syPreAssembledPackingListVo.getIsReference());
+            }else{
+                queryWrapper.ge("a.is_Reference",syPreAssembledPackingListVo.getIsReference());
+            }
+        }
+        Page<SyPreAssembledPackingListVo> page = new Page<SyPreAssembledPackingListVo>(1, 10000);
+        Result result=new Result();
+        try{
+            List<SyPreAssembledPackingListVo> pageLists = syPreAssembledPackingListService.selectPage(page, queryWrapper).getRecords();
+            if(pageLists.size()==0){
+                result.setResult(null);
+                result.setMessage("导出失败！没有查询到数据");
+                result.setSuccess(false);
+                return result;
+            }
+            List<SyPreAssembledPackingList> temps=new ArrayList<>();
+            for (SyPreAssembledPackingListVo temp : pageLists) {
+                QueryWrapper<SyPreAssembledPackingList> queryWrapper1 = new QueryWrapper<SyPreAssembledPackingList>();
+                queryWrapper1.eq("id",temp.getId()).eq("del_flag",0);//预装箱单主表id
+                SyPreAssembledPackingList preAssembledPackingList=syPreAssembledPackingListService.queryById(queryWrapper1);//已筛选删除状态
+                List<SyPreAssembledPackingListItem> spaplItems = syPreAssembledPackingListItemService.selectByMainId(temp.getId());//已筛选删除状态
+                if(spaplItems.size()>0){
+                    preAssembledPackingList.setSyPreAssembledPackingListItemList(spaplItems);
+                }
+                temps.add(preAssembledPackingList);
+                if(preAssembledPackingList.getStatus().equals("0")){
+                    result.setCode(201);
+                    result.setMessage("单据"+preAssembledPackingList.getDocumentNo()+"未提交!");
+                    result.setSuccess(false);
+                    return result;
+                }
+            }
+            String load="D:\\单证模板\\预装箱单列表导出test.xlsx";//事件
+            int count = temps.size();//分几条sheet
+            File file=new File(load);
+            TemplateExportParams templateExcelConstants=new TemplateExportParams(file.getAbsolutePath(),true,"预装箱单");
+            List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
+            Map<Integer, List<Map<String, Object>>> maps = new HashMap<Integer, List<Map<String, Object>>>();
+            for (int i = 1; i <=count ; i++) {
+                List<SyPreAssembledPackingList> exportList=new ArrayList<>();
+                exportList.add(temps.get(i-1));
+                SyPreAssembledPackingList exportList2=temps.get(i-1);
+                Map<String, Object> map = new HashMap<String, Object>();
+                map.put("entity", exportList2);
+                listMap.add(map);
+            }
+            maps.put(0,listMap);
+            templateExcelConstants.setColForEach(true);
+            Workbook workbook = ExcelExportUtil.exportExcelClone(maps,templateExcelConstants);
+            refreshSheet3(workbook,temps);//配置某列数据
+            ServletOutputStream outputStream = response.getOutputStream();
+            workbook.write(outputStream);
+            result.setCode(200);
+            result.setMessage("导出成功！");
+            result.setSuccess(true);
+        }catch (Exception e){
+            e.printStackTrace();
+            result.setMessage(e.getMessage());
+            result.setSuccess(false);
+        }finally {
+            return result;
+        }
+
+    }
+
+    public static void refreshSheet3(Workbook workbook,List<SyPreAssembledPackingList> items) {
 
         CellStyle cellStyle = workbook.createCellStyle();//设置单元格样式
+        cellStyle.setAlignment(HorizontalAlignment.CENTER);//左右居中
+        cellStyle.setWrapText(true);//自动换行
+        cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//上下居中
+        cellStyle.setFillForegroundColor(IndexedColors.WHITE.getIndex());//设置前景色 现在是浅绿色
+        cellStyle.setFillBackgroundColor(HSSFColor.HSSFColorPredefined.WHITE.getIndex());//设置背景色 现在是浅绿色
+        cellStyle.setBorderBottom(BorderStyle.THIN);//边框
+        cellStyle.setBorderTop(BorderStyle.THIN);//边框
+        cellStyle.setBorderLeft(BorderStyle.THIN);//边框
+        cellStyle.setBorderRight(BorderStyle.THIN);//边框
+        cellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);//必须设置 否则无效
+
+        CellStyle cellStyle2 = workbook.createCellStyle();//设置单元格样式
+        cellStyle2.setAlignment(HorizontalAlignment.CENTER);//左右居中
+        cellStyle2.setWrapText(true);//自动换行
+        cellStyle2.setFillForegroundColor(IndexedColors.WHITE.getIndex());//设置前景色 现在是浅绿色
+        cellStyle2.setFillBackgroundColor(HSSFColor.HSSFColorPredefined.WHITE.getIndex());//设置背景色 现在是浅绿色
+        cellStyle2.setBorderBottom(BorderStyle.THIN);//边框
+        cellStyle2.setBorderTop(BorderStyle.THIN);//边框
+        cellStyle2.setBorderLeft(BorderStyle.THIN);//边框
+        cellStyle2.setBorderRight(BorderStyle.THIN);//边框
+        cellStyle2.setVerticalAlignment(VerticalAlignment.CENTER);//上下居中
+        cellStyle2.setFillPattern(FillPatternType.SOLID_FOREGROUND);//必须设置 否则无效
+
+        Font headerFont = workbook.createFont();
+        headerFont.setFontHeightInPoints((short) 12);
+        headerFont.setFontName("黑体");
+        headerFont.setColor(Font.COLOR_RED);
+        cellStyle2.setFont(headerFont);
+
+        Iterator sheets=workbook.sheetIterator();
+       // int num=items.size()-1;
+        int num1=0;
+        int x=0;
+        while (sheets.hasNext()){
+            Sheet sheet=(Sheet) sheets.next();
+            //箱数、件数、总净重、总体积、总毛重 不需要合计只需要获取主表数据
+            for (SyPreAssembledPackingList list : items){
+                Row row = sheet.createRow(num1+1);
+                num1++;
+                String [] args=list.toString1().split(",");
+                for (int i=0;i<args.length;i++){
+                    Cell cell = row.createCell(i);//横向
+                    cell.setCellValue(args[i]);
+                    cell.setCellStyle(cellStyle);
+                }
+                int num2=0;
+                for (SyPreAssembledPackingListItem item : list.getSyPreAssembledPackingListItemList()){
+                    if(num2==0){
+                        Row row1 = sheet.createRow(num1+1);
+                        num1++;
+                        String strs="";
+                        for (SizeTable sizeTable: item.getSizeTables()){
+                            strs=strs+sizeTable.getSize()+",";
+                        }
+                        String[] args2=("B号码,ITEMCODE,LABEL,启始箱号,结束箱号,颜色（中英文）,"+strs+
+                        "件数/每箱,箱数,总件数,外箱长度,外箱宽度,外箱高度,总体积,外箱净重,总净重,外箱毛重,总毛重").split(",");
+                        num2++;
+                        for (int i=0;i<args2.length;i++){
+                            Cell cell = row1.createCell(i);//横向
+                            cell.setCellValue(args2[i]);
+                            if(i<args2.length-11&&i>5){
+                                cell.setCellStyle(cellStyle2);
+                            }else{
+                                cell.setCellStyle(cellStyle);
+                            }
+                        }
+                    }
+                    Row row2 = sheet.createRow(num1+1);
+                    num1++;
+                    String [] args3=item.toString4().split(",");
+                    x=args3.length;
+                    for (int i=0;i<args3.length;i++){
+                        Cell cell = row2.createCell(i);//横向
+                        if(i>2&&i!=5&&args3[i].length()>0){
+                            cell.setCellValue(Double.parseDouble(args3[i]));
+                        }
+                        cell.setCellStyle(cellStyle);
+                    }
+                }
+                Row row2 = sheet.createRow(num1+1);
 
+                Cell cell = row2.createCell(0);//横向
+                cell.setCellValue("合计");
+                cell.setCellStyle(cellStyle);
+                Cell cell2 = row2.createCell(x-10);//横向
+                cell2.setCellValue(list.getTotalBoxes().intValue());//箱数
+                cell2.setCellStyle(cellStyle);
+                Cell cell3 = row2.createCell(x-9);//横向
+                cell3.setCellValue(list.getTotal().intValue());//总件数
+                cell3.setCellStyle(cellStyle);
+                Cell cell4 = row2.createCell(x-5);//横向
+                cell4.setCellValue(list.getTotalVolume().doubleValue());//总体积
+                cell4.setCellStyle(cellStyle);
+                Cell cell5 = row2.createCell(x-3);//横向
+                cell5.setCellValue(list.getTotalNetWeight().doubleValue());//总净重
+                cell5.setCellStyle(cellStyle);
+                Cell cell6 = row2.createCell(x-1);//横向
+                cell6.setCellValue(list.getTotalGrossWeight().doubleValue());//总毛重
+                cell6.setCellStyle(cellStyle);
+                num1++;
+                num1++;
+            }
+        }
+    }
+
+    public static void refreshSheet(Workbook workbook,List<SyPreAssembledPackingListVo> mains ) {
+
+        CellStyle cellStyle = workbook.createCellStyle();//设置单元格样式
         cellStyle.setAlignment(HorizontalAlignment.CENTER);//左右居中
         cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//上下居中
         cellStyle.setFillForegroundColor(IndexedColors.YELLOW.getIndex());//设置前景色 现在是浅绿色
@@ -1055,141 +1284,9 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 
 
 
-    @AutoLog(value = "导出")
-    @ApiOperation(value="导出", notes="导出")
-    @RequestMapping(value = "/exportXls")
-    public Result<SyPreAssembledPackingList> exportXls3(HttpServletRequest request,HttpServletResponse response,SyPreAssembledPackingListVo syPreAssembledPackingListVo,
-                                                        String stratDate,
-                                                        String endDate,
-                                                        String status) {
-        status="1";
-        SyPreAssembledPackingList syPreAssembledPackingList=new SyPreAssembledPackingList();
-        QueryWrapper<SyPreAssembledPackingListVo> queryWrapper =new QueryWrapper<>();//初始化
-        queryWrapper.eq("a.del_flag","0");//默认查询未删除
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getId())){//查询id
-            queryWrapper.eq("a.id",syPreAssembledPackingListVo.getId());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){//订单号
-            queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getGarmentFactory())){//成衣工厂
-            queryWrapper.like("b.garment_Factory",syPreAssembledPackingListVo.getGarmentFactory());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDocumentNo())){//单据号
-            queryWrapper.like("a.document_No",syPreAssembledPackingListVo.getDocumentNo());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getItemNumber())){//款号
-            queryWrapper.like("a.item_number",syPreAssembledPackingListVo.getItemNumber());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getProductName())){//品名
-            queryWrapper.like("a.product_Name",syPreAssembledPackingListVo.getProductName());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateBy())){//创建人
-            queryWrapper.like("a.create_by",syPreAssembledPackingListVo.getCreateBy());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateTime())){//创建时间
-            queryWrapper.like("a.create_time",syPreAssembledPackingListVo.getCreateTime());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDepositaryReceiptNo())){//预托书号
-            queryWrapper.like("a.depositary_Receipt_No",syPreAssembledPackingListVo.getDepositaryReceiptNo());
-        }
-        // 小po 分销点
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getSmallPo())){//小po
-            queryWrapper.like("b.small_Po",syPreAssembledPackingListVo.getSmallPo());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDistributionPoint())){//分销点
-            queryWrapper.like("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getStatus())){//状态
-            queryWrapper.like("a.status",syPreAssembledPackingListVo.getStatus());
-        }
-        //预发货日期
-        if(oConvertUtils.isNotEmpty(stratDate)){//起始
-            queryWrapper.ge("b.hod",stratDate);
-        }
-        if(oConvertUtils.isNotEmpty(endDate)){//结束
-            queryWrapper.le("b.hod",endDate);
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getAcSetNo())){//账套号
-            queryWrapper.like("b.ac_Set_No",syPreAssembledPackingListVo.getAcSetNo());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getIsReference())){//是否被参照
-            if(syPreAssembledPackingListVo.getIsReference().equals(0)){
-                queryWrapper.eq("a.is_Reference",syPreAssembledPackingListVo.getIsReference());
-            }else{
-                queryWrapper.ge("a.is_Reference",syPreAssembledPackingListVo.getIsReference());
-            }
-        }
-        Page<SyPreAssembledPackingListVo> page = new Page<SyPreAssembledPackingListVo>(1, 10000);
-        Result result=new Result();
-        try{
-         //   QueryWrapper<SyPreAssembledPackingList> queryWrapper = QueryGenerator.initQueryWrapper(syPreAssembledPackingList, request.getParameterMap());
-          //  queryWrapper.eq("del_flag","0");
-           // queryWrapper.orderByDesc(	"create_time");//创建时间倒序
-            List<SyPreAssembledPackingListVo> pageLists = syPreAssembledPackingListService.selectPage(page, queryWrapper).getRecords();
-            if(pageLists.size()==0){
-                result.setResult(null);
-                result.setMessage("导出失败！没有查询到数据");
-                result.setSuccess(false);
-                return result;
-            }
-            List<SyPreAssembledPackingList> temps=new ArrayList<>();
-            for (SyPreAssembledPackingListVo temp : pageLists) {
-                QueryWrapper<SyPreAssembledPackingList> queryWrapper1 = new QueryWrapper<SyPreAssembledPackingList>();
-                queryWrapper1.eq("id",temp.getId()).eq("del_flag",0);//预装箱单主表id
-                SyPreAssembledPackingList preAssembledPackingList=syPreAssembledPackingListService.queryById(queryWrapper1);//已筛选删除状态
-                List<SyPreAssembledPackingListItem> spaplItems = syPreAssembledPackingListItemService.selectByMainId(temp.getId());//已筛选删除状态
-                if(spaplItems.size()>0){
-                    preAssembledPackingList.setSyPreAssembledPackingListItemList(spaplItems);
-                }
-                temps.add(preAssembledPackingList);
-                if(preAssembledPackingList.getStatus().equals("0")){
-                    result.setCode(201);
-                    result.setMessage("单据"+preAssembledPackingList.getDocumentNo()+"未提交!");
-                    result.setSuccess(false);
-                    return result;
-                }
-            }
-            String load="D:\\单证模板\\test2.xlsx";
-            if(status!=null&&status.equals("1")){
-                load="D:\\单证模板\\预装箱单成衣.xlsx";
-            }
-            int count = temps.size();//分几条sheet
-            File file=new File(load);
-            TemplateExportParams templateExcelConstants=new TemplateExportParams(file.getAbsolutePath(),true,"预装箱单");
-            List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
-            Map<Integer, List<Map<String, Object>>> maps = new HashMap<Integer, List<Map<String, Object>>>();
-            for (int i = 1; i <=count ; i++) {
-                List<SyPreAssembledPackingList> exportList=new ArrayList<>();
-                exportList.add(temps.get(i-1));
-                SyPreAssembledPackingList exportList2=temps.get(i-1);
-                Map<String, Object> map = new HashMap<String, Object>();
-                map.put("entity", exportList2);
-                listMap.add(map);
-            }
-            maps.put(0,listMap);
-            templateExcelConstants.setColForEach(true);
-            Workbook workbook = ExcelExportUtil.exportExcelClone(maps,templateExcelConstants);
-            refreshSheet(workbook,temps,status);//配置某列数据
-            ServletOutputStream outputStream = response.getOutputStream();
-            workbook.write(outputStream);
 
-            result.setCode(200);
-            result.setResult(temps.get(0));
-            result.setMessage("导出成功！");
-            result.setSuccess(true);
-        }catch (Exception e){
-            e.printStackTrace();
-            result.setResult(null);
-            result.setMessage(e.getMessage());
-            result.setSuccess(false);
-        }finally {
-            return result;
-        }
-
-    }
 
-    protected static void refreshSheet(Workbook workbook,List<SyPreAssembledPackingList> items,String name) {
+    public static void refreshSheet(Workbook workbook,List<SyPreAssembledPackingList> items,String name) {
         CellStyle cellStyle = workbook.createCellStyle();//设置单元格样式
 
         cellStyle.setAlignment(HorizontalAlignment.CENTER);//左右居中
@@ -1243,21 +1340,6 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                         cell.setCellValue(params[x]);//比例
                     }
                 }
-                /*else{
-                    params=("序号,PO,款号,订单号,UNIT PRICE(单价),分销点,ITEMCODE,启始箱号,结束箱号," +
-                            "颜色(中英文),"+strs+"件数/每箱,箱数,总件数,外箱长度,外箱宽度,外箱高度,总体积,外箱净重,总净重," +
-                            "外箱毛重,总毛重,NN.W,总价,Lot NO,Packs CODE,DC NO,SKU号码,LABEL(标签),ORDER NO,Pre-Pack SKU Number").split(",");
-                    Row row2 = sheet.createRow(3);
-                    for (int x=0;x<params.length;x++){
-                        Cell cell = row2.createCell(x);//横向
-                        if(x>10&&x<params.length-20){
-                            cell.setCellStyle(cellStyle);
-                        }else{
-                            cell.setCellStyle(cellStyle2);
-                        }
-                        cell.setCellValue(params[x]);//比例
-                    }
-                }*/
                 List<SizeTable> sizes=list.get(i).getSizeTables();
                 SyPreAssembledPackingListItem itemN=list.get(0);
                 if(name!=null&&name.equals("1")){
@@ -1286,22 +1368,6 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                         }
                     }
                 }
-               /* else{
-                    params=list.get(i).toString2().replace("null","").split(",");
-                    for (int y=0;y<params.length;y++){
-                        Cell cell = row.createCell(y);//横向
-                        if(y==0){
-                            cell.setCellStyle(cellStyle2);
-                            cell.setCellValue(i+1);//比例
-                            continue;
-                        }else if(y>10&&y<params.length-20){
-                            cell.setCellStyle(cellStyle);
-                        }else{
-                            cell.setCellStyle(cellStyle2);
-                        }
-                        cell.setCellValue(params[y]);//比例
-                    }
-                }*/
             }
         }
     }

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

@@ -225,4 +225,14 @@ public class SyPreAssembledPackingList implements Serializable {
 		syDeclarationElementsId=params[18+5];
 		elementsId=params[19+5];
 	}
+
+	public String toString1(){
+		//订单号：	A11293629	款号：	18010	品名：	7B印花网眼T恤
+		return  "订单号:"+ ","+
+				orderNumber+ ","+
+				"款号:"+ ","+
+				itemNumber+ ","+
+				"品名:"+ ","+
+				productName;
+	}
 }

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

@@ -443,4 +443,39 @@ public class SyPreAssembledPackingListItem implements Serializable {
 		syPreAssembledPackingListId+ ","+
 		id.substring(0,id.length()-1);
 	}
+
+	public String toString4() {
+		//B号码	ITEMCODE	LABEL	启始箱号	结束箱号	颜色（中英文）
+		//sizes
+		//件数/每箱	箱数	总件数	外箱长度	外箱宽度	外箱高度	总体积	外箱净重	总净重	外箱毛重	总毛重
+		String sizes="";
+		id="";
+		for (SizeTable size : sizeTables){
+			if(size.getProportion()==null){
+				sizes+=",";
+			}else{
+				sizes+=size.getProportion()+",";
+			}
+			id+=size.getItemId()+"-";
+		}
+		return
+			" ," +
+			" ,"+
+			" ,"+
+			startingBoxNumber + ","+
+			endCaseNumber +  ","+
+			colour +  ","+
+			sizes +
+			piecesBox+ ","+
+			boxNumber+ ","+
+			total+ ","+
+			outerBoxLength + ","+
+			outerBoxWidth + ","+
+			outerBoxHeight + ","+
+			totalVolume+ ","+
+			netWeight+ ","+
+			totalNetWeight+ ","+
+			grossWeight + ","+
+			totalGrossWeight;
+	}
 }

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

@@ -650,6 +650,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 			BigDecimal total1=new BigDecimal("0");
 			BigDecimal total2=new BigDecimal("0");
 			BigDecimal total3=new BigDecimal("0");
+			BigDecimal total4=new BigDecimal("0");//(本次数量+现有数量)>1.9*发货数量就报错
 			String name="";
 			for (SyPreAssembledPackingListItem item :main.getSyPreAssembledPackingListItemList()){
 				total3=total3.add(item.getTotal());
@@ -664,7 +665,6 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 						}else{
 							name=syshippings.getItemNumber()+"-"+item.getSmallPo();
 						}
-
 					}
 				}
 				if(!ids.equals("")){
@@ -685,11 +685,15 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 					SyPreAssembledPackingListItem sypre=syPreAssembledPackingListItemMapper.selectOne(queryWrapper);
 					if(sypre!=null){;
 						total2=sypre.getTotal();
-						throw new JeecgBootException("该单据已被参照,请勿重复提交");
+						//throw new JeecgBootException("该单据已被参照,请勿重复提交");
 					}
 				}
 			}
-			strs+=name+"数量"+total1.intValue()+",已参照数量"+total2.intValue()+",本次数量"+total3.intValue()+"；";
+			total4=total4.add(total2).add(total3);
+			if(total4.doubleValue()>total1.doubleValue()*1.9){//(本次数量+现有数量)>1.9*发货数量就报错
+				throw new JeecgBootException("本次导入数量+装箱单现有数量大于发货订单数量*1.9,请勿重复导入");
+			}
+			strs+=name+"的原单据数量"+total1.intValue()+",已参照数量"+total2.intValue()+",本次数量"+total3.intValue()+"；";
 			num++;
 		}
 		return strs;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -634,8 +634,14 @@ public class SyPackingListFabricController {
 								 throw new JeecgBootException("请填写第"+(x+1)+"行里的"+sheet.getRow(3).getCell(i));
 							 }
 						 }
-						 cell.setCellType(CellType.STRING);//获取的都转换成String
-						 FormulaEvaluator formulaEvaluator = new XSSFFormulaEvaluator((XSSFWorkbook) workbook1);
+						 if(cell!=null){
+							 cell.setCellType(CellType.STRING);//获取的都转换成String
+							 itemStrs.add(cell.toString());
+						 }else{
+							 itemStrs.add("");
+						 }
+
+						 /*FormulaEvaluator formulaEvaluator = new XSSFFormulaEvaluator((XSSFWorkbook) workbook1);
 						 //获取单元格内容的类型
 						 CellType cellType = cell.getCellType();
 						 //判断是否存储的为公式，此处本可以不加判断
@@ -648,8 +654,8 @@ public class SyPackingListFabricController {
 							 //System.out.println(evaluate.formatAsString());
 							 itemStrs.add(evaluate.formatAsString());
 						 }else{
-							 itemStrs.add(cell.toString());
-						 }
+
+						 }*/
 					 }
 					 SyPackingListFabricItem syPackingListFabricItem=new SyPackingListFabricItem(itemStrs.toArray(new String[itemStrs.size()]));
 					 items.add(syPackingListFabricItem);

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

@@ -772,7 +772,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	@Override
 	public String excelTest(Map<String, SyPackingListFabric> maps) {
 		String strs="";
-		int num=1;
 		for(SyPackingListFabric main : maps.values()){
 			BigDecimal total1=new BigDecimal("0");
 			BigDecimal total2=new BigDecimal("0");
@@ -780,18 +779,23 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 			String ids="";
 			String name="";
+			int num=5;
 			for (SyPackingListFabricItem item :main.getSyPackingListFabricItem()){
 				SyShippingDetailsItem syShippingDetailsItem=syShippingDetailsItemMapper.selectById(item.getSyShippingDetailsItemId());//获取物料分类和其他数据
 				//物料分类
 				if(syShippingDetailsItem!=null){//不为null
 					SyOrderDataItem dataItem=syOrderDataItemMapper.selectById(syShippingDetailsItem.getSyOrderDataItemId());
-					if(dataItem.getMasterMetering().equals("KG")){
-						total3=total3.add(item.getNetWeight());
+					if(dataItem!=null&&dataItem.getMasterMetering().equals("KG")){
+						if(dataItem.getMasterMetering().equals("KG")){
+							total3=total3.add(item.getNetWeight());
+						}else{
+							total3=total3.add(item.getActualDeclaredQuantity());
+						}
 					}else{
-						total3=total3.add(item.getActualDeclaredQuantity());
+						throw new JeecgBootException("第"+num+"行找不到订单数据，获取不到单位");
 					}
-					//item.setInventoryCcode(syShippingDetailsItem.getInventoryCcode());//物料分类
-					//item.setPrice(syShippingDetailsItem.getSalesUnitPrice());//价格
+					item.setInventoryCcode(syShippingDetailsItem.getInventoryCcode());//物料分类
+					item.setPrice(syShippingDetailsItem.getSalesUnitPrice());//价格
 					/*if(syShippingDetailsItem.getMasterMetering()!=null){
 						item.setMasterMetering(syShippingDetailsItem.getMasterMetering());//单位
 					}*/
@@ -822,7 +826,10 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 							//throw new JeecgBootException("单位不为kg的物料请填写实际报关数量,用于计算金额");
 						}
 					}*/
+				}else{
+					throw new JeecgBootException("第"+num+"行找不到对应的出运明细");
 				}
+				num++;
 				//单位换算
 				name=item.getPlanLotNumber()+"-"+item.getDeclarationName();
 				ids+=item.getSyShippingDetailsItemId()+",";//获取出运明细子表id
@@ -852,7 +859,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				}
 			}
 			strs+=name+"的原单据数量"+total1.setScale(2,BigDecimal.ROUND_HALF_UP)+",已参照数量"+total2.setScale(2,BigDecimal.ROUND_HALF_UP)+",本次数量"+total3.setScale(2,BigDecimal.ROUND_HALF_UP)+"；";
-			num++;
 		}
 		return strs;
 	}
@@ -901,8 +907,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		JSONArray mapList6=new JSONArray();
 		JSONArray mapList7=new JSONArray();//印厂给染厂做的出库
 
-
-
 		JSONArray mapLists=new JSONArray();
 		//账套号
 		if (main!=null){
@@ -958,6 +962,15 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			map7.put("CRDCODE","12");//入库类别
 			map7.put("CGLTYPE","委外订单");//来源单据类型
 
+			if(main.getShippingOrderNumber()!=null){
+				map.put("CDEFINE10",main.getShippingOrderNumber());
+				map2.put("CDEFINE10",main.getShippingOrderNumber());
+				map3.put("CDEFINE10",main.getShippingOrderNumber());
+				map4.put("CDEFINE10",main.getShippingOrderNumber());
+				map5.put("CDEFINE10",main.getShippingOrderNumber());
+				map6.put("CDEFINE10",main.getShippingOrderNumber());
+				map7.put("CDEFINE10",main.getShippingOrderNumber());
+			}
 
 			JSONArray mapItems=new JSONArray();
 			JSONArray mapItems2=new JSONArray();
@@ -1002,7 +1015,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				JSONObject mapItem5=new JSONObject();
 				JSONObject mapItem6=new JSONObject();
 
-
 				map.put("CACCID",mapt.get("account"));//账套号
 				map2.put("CACCID",mapt.get("account"));//账套号
 				map3.put("CACCID",mapt.get("account"));//账套号
@@ -1011,7 +1023,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				map6.put("CACCID",mapt.get("account"));//账套号
 				map7.put("CACCID",mapt.get("account"));//账套号
 
-
 				if(mapt.get("account").equals("903")){
 					mapItem.put("CBATCH",item.getDyelotNumber());//缸号
 					mapItem4.put("CBATCH",item.getDyelotNumber());//缸号
@@ -1060,7 +1071,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					mapItem.put("AUTOID_PO",orderDataItem.get("id"));//明细ID（采购订单行ID/委外订单行ID）
 					map5.put("CGLTYPE","委外订单");
 
-
 					if(item.getInventoryCcode()!=null&&item.getInventoryCcode().indexOf("040")>-1&&mapt.get("account").equals("903")){//903账套中物料分类为040的印花面料
 						List<Map<String,Object>> orderDataItem3 =syPackingListFabricMapper.getOM_MOMaterials(item.getOmpoIdItem(),item.getInventoryCode());//委外订单子表
 						Map<String,Object> mapStr1=syPackingListFabricMapper.getOM_MOMain(item.getOmpoIdItem(),item.getInventoryCode());//供应商编码，存货编码
@@ -1096,7 +1106,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						}
 					}
 
-
 					mapItem5.put("POAUTOIDCOL","MODetailsID");//明细ID对应字段名(关联单据类型为采购订单传ID，委外订单传MODetailsID，入库单为Autoid)
 					mapItem5.put("AUTOID_PO",orderDataItem.get("id"));//明细ID（采购订单行ID/委外订单行ID）
 					mapItem5.put("IORITAXCOST",orderDataItem.get("iTaxPrice"));//原币单价
@@ -1167,14 +1176,10 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					mapItem6.put("IQUANTITY",item.getActualDeclaredQuantity());//数量
 				}
 
-
-
 				mapItem.put("CINVCODE",item.getInventoryCode());//存货编码
 				//mapItem.put("INUM",orderDataItem.get("inum"));//明细ID（采购订单行ID/委外订单行ID）
-
 				//mapItem.put("cBatch","x");//批号
 
-
 				mapItem3.put("CINVCODE",item.getInventoryCode());//存货编码
 
 				mapItem4.put("CINVCODE",item.getInventoryCode());//存货编码
@@ -1187,7 +1192,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				mapItem6.put("CINVCODE",item.getInventoryCode());//存货编码
 				mapItem6.put("size",item.getSize());//根据尺码判断
 
-
 				mapItems.add(mapItem);
 				mapItems3.add(mapItem3);
 				mapItems4.add(mapItem4);
@@ -1279,7 +1283,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(u8ReceiptNo103.substring(u8ReceiptNo103.length()-4 ) ),"108");
 					case "3":
 						String consignmentName=maps.get(account).get("code");//获取销售发货单
-						System.out.println("consignmentName\t"+consignmentName);
 						List<Map<String,Object>> consignmentMaps= syPackingListTailoringMapper.getDispatchLists(consignmentName);
 						if(consignmentMaps!=null){
 							for (Map map : consignmentMaps){
@@ -1304,9 +1307,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						recording(main,recording);
 					case "4":
 						String saleoutName=maps.get(account).get("code");//销售出库单
-
 						this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(saleoutName),"131");
-
 						List<Map<String,Object>> saleoutMaps= syPackingListTailoringMapper.getRdrecord32(saleoutName);
 						if(saleoutMaps!=null){
 							for (Map map : saleoutMaps){
@@ -1314,8 +1315,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 								List<Map<String,Object>> mapItems6= (List<Map<String,Object>>) jsonObject.get("DETAILList");
 								for (Map itemMap6 :  mapItems6){
 									itemMap6.put("DISAUTOIDCOL","AUTOID");
-									if(itemMap6.get("size").equals(map.get("cFree2"))&&(Double.parseDouble( itemMap6.get("IQUANTITY").toString())
-											==Double.parseDouble( map.get("iQuantity").toString()))&&!itemMap6.containsKey("AUTOID_DIS")){
+									//itemMap6.get("size").equals(map.get("cFree2"))&&
+									if((Double.parseDouble( itemMap6.get("IQUANTITY").toString()) ==Double.parseDouble( map.get("iQuantity").toString()))&&!itemMap6.containsKey("AUTOID_DIS")){
 										itemMap6.put("AUTOID_DIS",map.get("autoid"));
 									}
 								}
@@ -1350,7 +1351,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		String u8ReceiptNo103= resturn3.getJSONObject(0).get("U8ReceiptNo").toString();
 		this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(u8ReceiptNo103.substring(u8ReceiptNo103.length()-4 ) ),"108");
 
-			JSONObject jsonObject3=resturn3.getJSONObject(0);//销售发货单
+		JSONObject jsonObject3=resturn3.getJSONObject(0);//销售发货单
 		String consignmentName=jsonObject3.get("U8ReceiptNo").toString();//获取销售发货单
 		List<Map<String,Object>> consignmentMaps= syPackingListTailoringMapper.getDispatchLists(consignmentName);
 		if(consignmentMaps!=null){
@@ -1398,8 +1399,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		recording(main,recording);
 		//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn6.getJSONObject(0).get("U8ReceiptNo").toString()),"120");
 		return mapList.getJSONObject(0).get("CACCID").toString()+"账套推送成功!";
-
-
 	}
 
 	/**
@@ -1625,7 +1624,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					queryWrapperCount.eq("is_U8_Data", "1");//判断为辅料的数据
 					queryWrapperCount.select("lpad(count(0)+1,6,0) as id");
 					String dateNo = "FL" + sf.format(System.currentTimeMillis()) + getOne(queryWrapperCount).getId();//生成辅料单据号*/
-
 					sy.setDocumentNo(account+sy.getDocumentNo());//单据号
 					sy.setDataSource("u8拉取");//直接从u8拉取的数据
 					sy.setId(oConvertUtils.getId());
@@ -1748,7 +1746,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 							if(sy1.getPrice()!=null&&sy1.getActualDeclaredQuantity()!=null){
 								sy1.setTotalPrice(sy1.getActualDeclaredQuantity().multiply(sy1.getPrice()));//实际报关数量*单价
 							}
-
 							if((sy1.getInventoryCcode().indexOf("03")!=-1&&!sy1.getInventoryCcode().equals("0399")) ||
 								(sy1.getInventoryCcode().indexOf("02")!=-1&&!sy1.getInventoryCcode().equals("0299"))||
 								(sy1.getInventoryCcode().indexOf("04")!=-1&&!sy1.getInventoryCcode().equals("0499"))){
@@ -1789,11 +1786,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 										sy1.setActualDeclaredQuantity(null);
 									}
 								}
-
-
-
 							}
-
 							if(sy1.getMasterMetering().equals("KG")){//计算总价
 								if(sy1.getNetWeight()!=null){
 									sy1.setTotalPrice(sy1.getNetWeight().multiply(sy1.getPrice()));//净重*单价
@@ -1803,17 +1796,14 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 									sy1.setTotalPrice(sy1.getActualDeclaredQuantity().multiply(sy1.getPrice()));//实际报关数量*单价
 								}
 							}
-
 							/*if(sy1.getActualDeclaredQuantity()!=null){
 								updateQuantity(sy1.getActualDeclaredQuantity(),sy1.getSyShippingDetailsItemId(),sy1.getMasterMetering());
 							}*/
-
 							if(sy1.getMasterMetering().equals("KG")&&sy1.getNetWeight()!=null){
 								updateQuantity(sy1.getNetWeight(),sy1.getSyShippingDetailsItemId(),sy1.getMasterMetering());
 							}else if(sy1.getActualDeclaredQuantity()!=null){
 								updateQuantity(sy1.getActualDeclaredQuantity(),sy1.getSyShippingDetailsItemId(),sy1.getMasterMetering());
 							}
-
 							items.add(sy1);
 							syShippingDetailsItem.setIsPull("2");//拉取成功
 							syShippingDetailsItem.setIsReference(2);//回写
@@ -1825,7 +1815,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 							items =new ArrayList<>();//空对象
 							break;
 						}
-
 					}
 					if(items.size()>0){
 						sy.setSyPackingListFabricItem(items);

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

@@ -1075,7 +1075,7 @@ public class SyPackingListTailoringController {
 			 main.setSyPackingListTailoringItemList(items);
 			 mains.add(main);
 		 }
-		 return syPackingListTailoringService.test(mains);//新增
+		 return syPackingListTailoringService.excelTest(mains);//新增
 	 }
 
 	 @AutoLog(value = "装箱单成衣JSON")

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

@@ -84,7 +84,7 @@ public interface ISyPackingListTailoringService extends IService<SyPackingListTa
 
 	boolean excelAdd(List<SyPackingListTailoring> mains);
 
-    String test(List<SyPackingListTailoring> mains);
+    String excelTest(List<SyPackingListTailoring> mains);
 
 	String one(SyPackingListTailoring main, Map<String, Object> map);
 

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

@@ -693,13 +693,14 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 	}
 
 	@Override
-	public String test(List<SyPackingListTailoring> mains) {
+	public String excelTest(List<SyPackingListTailoring> mains) {
 		String strs="";
 		int num=1;
 		for(SyPackingListTailoring main : mains){
 			BigDecimal total1=new BigDecimal("0");
 			BigDecimal total2=new BigDecimal("0");
 			BigDecimal total3=new BigDecimal("0");
+			BigDecimal total4=new BigDecimal("0");
 			for (SyPackingListTailoringItem item :main.getSyPackingListTailoringItemList()){
 				if(item.getTotal()!=null){
 					total3=total3.add(item.getTotal());
@@ -728,14 +729,18 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					queryWrapper.eq("del_Flag","0");//未删除
 					SyPackingListTailoringItem syPackingItem=syPackingListTailoringItemMapper.selectOne(queryWrapper);
 					if(syPackingItem!=null){
-						throw new JeecgBootException("该单据已被成衣参照！请勿重复操作");
+						total2=syPackingItem.getTotal();
+						//throw new JeecgBootException("该单据已被成衣参照！请勿重复操作");
 					}
 				}
 			}
+			total4=total4.add(total2).add(total3);
+			if(total4.doubleValue()>total1.doubleValue()*1.9){//(本次数量+现有数量)>1.9*发货数量就报错
+				throw new JeecgBootException("本次导入数量+装箱单现有数量大于发货订单数量*1.9,请勿重复导入");
+			}
 			strs+="第"+num+"页原单据数量"+total1.intValue()+",已参照数量"+total2.intValue()+",本次数量"+total3.intValue()+"；";
 			num++;
 		}
-		System.out.println("strs\n"+strs);
 		return strs;
 	}
 
@@ -794,7 +799,6 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		//账套号
 		if (main!=null){
 			Map<String,String> mapSort=new HashMap<>();
-//T0998
 			String createBy="进出口平台管理员";
 			//String createDate=main.getCreateTime().toString();
 			String createDate=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(main.getCreateTime());//转化日期类型
@@ -829,6 +833,15 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			map6.put("CTYPE","普通");//发票类型（普通，专用）
 			map6.put("CMAKER",createBy);//制单人名称
 
+			if(main.getShippingOrderNumber()!=null){
+				map.put("CDEFINE10",main.getShippingOrderNumber());
+				//map2.put("CDEFINE10",main.getShippingOrderNumber());
+				map3.put("CDEFINE10",main.getShippingOrderNumber());
+				map4.put("CDEFINE10",main.getShippingOrderNumber());
+				map5.put("CDEFINE10",main.getShippingOrderNumber());
+				map6.put("CDEFINE10",main.getShippingOrderNumber());
+			}
+
 			JSONArray mapItems=new JSONArray();
 			//JSONArray mapItems2=new JSONArray();
 			JSONArray mapItems3=new JSONArray();
@@ -1046,7 +1059,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 						recording(main,recording);
 						String u8ReceiptNo103= resturn3.getJSONObject(0).get("U8ReceiptNo").toString();
 						this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(u8ReceiptNo103.substring(u8ReceiptNo103.length()-4 ) ),"108");
-				case "3":
+					case "3":
 						String consignmentName=maps.get(account).get("code");//获取销售发货单
 						List<Map<String,Object>> consignmentMaps= syPackingListTailoringMapper.getDispatchLists(consignmentName);
 						if(consignmentMaps!=null){
@@ -1070,9 +1083,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 						recording(main,recording);
 					case "4":
 						String saleoutName=maps.get(account).get("code");//销售出库单
-
 						this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(saleoutName),"131");
-
 						List<Map<String,Object>> saleoutMaps= syPackingListTailoringMapper.getRdrecord32(saleoutName);
 						if(saleoutMaps!=null){
 							for (Map map : saleoutMaps){