寄存代发

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -142,7 +142,7 @@ public class SysUserController {
      * @param req
      * @return
      */
-    @RequiresPermissions("system:user:listAll")
+//    @RequiresPermissions("system:user:listAll")
     @RequestMapping(value = "/listAll", method = RequestMethod.GET)
     public Result<IPage<SysUser>> queryAllPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {

srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleOrderController.java

@@ -1201,7 +1201,8 @@ public class SaleOrderController {
                 List<String> noteList = new ArrayList<>();
                 productList.forEach(p -> noteList.add(p.getNotes()));
 
-                ExcelExportUtils.excelInsertRowNotes(getOutputStream(saleOrder.getBillCode() + ".xlsx", response),
+//                ExcelExportUtils.excelInsertRowNotes(getOutputStream(saleOrder.getBillCode() + ".xlsx", response),
+                ExcelExportUtils.excelInsertRowNotes(getOutputStream("OA - "+saleOrder.getProjectName() + ".xlsx", response),
                         tempFilePath, 19, noteList, 1, 4);
 
 

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleInterfaceItem.java

@@ -98,8 +98,8 @@ public class SaleInterfaceItem implements Serializable {
     @ApiModelProperty(value = "description")
     private String description;
 	/**supplierPartNumber*/
-	@Excel(name = "supplierPartNumber", width = 15)
-    @ApiModelProperty(value = "supplierPartNumber")
+	@Excel(name = "Part Number", width = 15)
+    @ApiModelProperty(value = "Part Number")
     private String supplierPartNumber;
 	/**quantity*/
 	@Excel(name = "quantity", width = 15)

srm-module-code/src/main/java/org/jeecg/modules/saleCode/service/impl/SaleInterfaceSyncServiceImpl.java

@@ -177,7 +177,24 @@ public class SaleInterfaceSyncServiceImpl extends ServiceImpl<SaleInterfaceSyncM
 //                    String unitPrice = line.get("unitPrice");
                     String commentLine = line.get("comment") == null ? "" : line.get("comment").toString();
 
+                    String partIdentification = line.get("partIdentification") == null ? "" : line.get("partIdentification").toString();
+                    String jsonStr = partIdentification.replace("=", "\":\"")
+                            .replace(", ", "\", \"")
+                            .replace("[{", "[{\"")
+                            .replace("}]", "\"}]");
+                    if(StringUtils.isNotBlank(jsonStr)){
+
+                        JsonNode rootNode = mapper.readTree(jsonStr);
+                        if(rootNode !=null && rootNode.size() > 0){
+
+                            String partCode = rootNode.get(0).path("partCode").asText();
+
+                            item.setSupplierPartNumber(partCode);
+                        }
+                    }
+
                     item.setHeadId(id);
+
                     item.setContent(line.toString());
                     item.setNumber(Integer.valueOf(number));
                     item.setDescription(description);
@@ -240,6 +257,7 @@ public class SaleInterfaceSyncServiceImpl extends ServiceImpl<SaleInterfaceSyncM
 
         } catch (Exception e) {
             System.out.println("====================================");
+            System.out.println(e.getMessage());
             throw new RuntimeException(e.getMessage());
         }
         return Result.OK("执行成功");

srm-module-code/src/main/java/org/jeecg/modules/saleCode/util/HttpUtils.java

@@ -130,22 +130,22 @@ public class HttpUtils {
     public static void main(String[] args) throws Exception {
 //        String token = getAccessToken();
 //        System.out.println("======="+token);
-        String ACCESS_TOKEN="vRUXIHnwl4rIuspHzVFrSO0PUPMoEaAy";
-        JsonNode jsonNode = getDateListByUrl(ACCESS_TOKEN);
+        String ACCESS_TOKEN="m4uTcejqjMj1LuJUzPi67LM7Oq48FndY";
+//        JsonNode jsonNode = getDateListByUrl(ACCESS_TOKEN);
 ////        ObjectMapper mapper = new ObjectMapper();
 //////
 //////
-//       JsonNode jsonNodeAll = getDateByUrl("7781d549-2c06-4c95-8bf8-05b31a4b2f8a",ACCESS_TOKEN);
+       JsonNode jsonNodeAll = getDateByUrl("22efb768-da48-415e-88d3-924350b6c23e",ACCESS_TOKEN);
 ////////
-        System.out.println("================1===--------------");
-       System.out.println(jsonNode.toString());
-////
-//        String buyerContact = jsonNodeAll.get("lineItems").toPrettyString();
-////
+//        System.out.println("================1===--------------");
+//       System.out.println(jsonNode.toString());
 ////
-//////        JsonNode jsonNodeAll2 = mapper.readTree(buyerContact);
-//        System.out.println("==============111--------------");
-//        System.out.println(buyerContact);
+        String buyerContact = jsonNodeAll.get("lineItems").toPrettyString();
+//////
+//////
+////////        JsonNode jsonNodeAll2 = mapper.readTree(buyerContact);
+        System.out.println("==============111--------------");
+        System.out.println(buyerContact);
 ////        Map<String, Object> buyerContact2Map = mapper.readValue(buyerContact, new TypeReference<Map<String, Object>>() {
 ////                });
 //        List<Map<String, Object>> result = mapper.readValue(buyerContact, new TypeReference<List<Map<String, Object>>>() {});

srm-module-code/src/main/java/org/jeecg/modules/storeCode/controller/StoreConsignmentInController.java

@@ -51,317 +51,318 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
 
- /**
+/**
  * @Description: 寄存代发入库主表
  * @Author: jeecg-boot
- * @Date:   2025-05-14
+ * @Date: 2025-05-14
  * @Version: V1.0
  */
-@Api(tags="寄存代发入库主表")
+@Api(tags = "寄存代发入库主表")
 @RestController
 @RequestMapping("/storeCode/storeConsignmentIn")
 @Slf4j
 public class StoreConsignmentInController {
-	@Autowired
-	private IStoreConsignmentInService storeConsignmentInService;
-	@Autowired
-	private IStoreConsignmentInDetailsService storeConsignmentInDetailsService;
-	@Autowired
-	private IStoreConsignmentInShipService storeConsignmentInShipService;
-	 @Autowired
-	 private ISerialPatternService serialPatternService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param storeConsignmentIn
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "寄存代发入库主表-分页列表查询")
-	@ApiOperation(value="寄存代发入库主表-分页列表查询", notes="寄存代发入库主表-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<StoreConsignmentIn>> queryPageList(StoreConsignmentIn storeConsignmentIn,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
+    @Autowired
+    private IStoreConsignmentInService storeConsignmentInService;
+    @Autowired
+    private IStoreConsignmentInDetailsService storeConsignmentInDetailsService;
+    @Autowired
+    private IStoreConsignmentInShipService storeConsignmentInShipService;
+    @Autowired
+    private ISerialPatternService serialPatternService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param storeConsignmentIn
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "寄存代发入库主表-分页列表查询")
+    @ApiOperation(value = "寄存代发入库主表-分页列表查询", notes = "寄存代发入库主表-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<StoreConsignmentIn>> queryPageList(StoreConsignmentIn storeConsignmentIn,
+                                                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                           HttpServletRequest req) {
         QueryWrapper<StoreConsignmentIn> queryWrapper = QueryGenerator.initQueryWrapper(storeConsignmentIn, req.getParameterMap());
-		Page<StoreConsignmentIn> page = new Page<StoreConsignmentIn>(pageNo, pageSize);
-		IPage<StoreConsignmentIn> pageList = storeConsignmentInService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param storeConsignmentInPage
-	 * @return
-	 */
-	@AutoLog(value = "寄存代发入库主表-添加")
-	@ApiOperation(value="寄存代发入库主表-添加", notes="寄存代发入库主表-添加")
+        Page<StoreConsignmentIn> page = new Page<StoreConsignmentIn>(pageNo, pageSize);
+        IPage<StoreConsignmentIn> pageList = storeConsignmentInService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param storeConsignmentInPage
+     * @return
+     */
+    @AutoLog(value = "寄存代发入库主表-添加")
+    @ApiOperation(value = "寄存代发入库主表-添加", notes = "寄存代发入库主表-添加")
     @RequiresPermissions("storeCode:store_consignment_in:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody StoreConsignmentInPage storeConsignmentInPage) {
-		StoreConsignmentIn storeConsignmentIn = new StoreConsignmentIn();
-		BeanUtils.copyProperties(storeConsignmentInPage, storeConsignmentIn);
-
-		String code = storeConsignmentIn.getBillCode();
-		if (StringUtils.isNotBlank(code)) {
-
-			QueryWrapper<StoreConsignmentIn> queryWrapper = new QueryWrapper();
-			queryWrapper.eq("bill_code", code);
-			queryWrapper.eq("del_flag", "0");
-
-			List<StoreConsignmentIn> list = storeConsignmentInService.list(queryWrapper);
-			if (list.size() != 0) {
-				return Result.error("寄存代发入库编码重复，请修改！");
-			}
-		} else {
-
-			Result<String> result = serialPatternService.getNextSerial("store_consignment_in", "bill_code");
-			if (!result.isSuccess()) {
-				return result;
-			}
-			storeConsignmentIn.setBillCode(result.getMessage());
-		}
-
-		storeConsignmentInService.saveMain(storeConsignmentIn, storeConsignmentInPage.getStoreConsignmentInDetailsList(),storeConsignmentInPage.getStoreConsignmentInShipList());
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param storeConsignmentInPage
-	 * @return
-	 */
-	@AutoLog(value = "寄存代发入库主表-编辑")
-	@ApiOperation(value="寄存代发入库主表-编辑", notes="寄存代发入库主表-编辑")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody StoreConsignmentInPage storeConsignmentInPage) {
+        StoreConsignmentIn storeConsignmentIn = new StoreConsignmentIn();
+        BeanUtils.copyProperties(storeConsignmentInPage, storeConsignmentIn);
+
+        String code = storeConsignmentIn.getBillCode();
+        if (StringUtils.isNotBlank(code)) {
+
+            QueryWrapper<StoreConsignmentIn> queryWrapper = new QueryWrapper();
+            queryWrapper.eq("bill_code", code);
+            queryWrapper.eq("del_flag", "0");
+
+            List<StoreConsignmentIn> list = storeConsignmentInService.list(queryWrapper);
+            if (list.size() != 0) {
+                return Result.error("寄存代发入库编码重复，请修改！");
+            }
+        } else {
+
+            Result<String> result = serialPatternService.getNextSerial("store_consignment_in", "bill_code");
+            if (!result.isSuccess()) {
+                return result;
+            }
+            storeConsignmentIn.setBillCode(result.getMessage());
+        }
+
+        storeConsignmentInService.saveMain(storeConsignmentIn, storeConsignmentInPage.getStoreConsignmentInDetailsList(), storeConsignmentInPage.getStoreConsignmentInShipList());
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param storeConsignmentInPage
+     * @return
+     */
+    @AutoLog(value = "寄存代发入库主表-编辑")
+    @ApiOperation(value = "寄存代发入库主表-编辑", notes = "寄存代发入库主表-编辑")
     @RequiresPermissions("storeCode:store_consignment_in:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody StoreConsignmentInPage storeConsignmentInPage) {
-		StoreConsignmentIn storeConsignmentIn = new StoreConsignmentIn();
-		BeanUtils.copyProperties(storeConsignmentInPage, storeConsignmentIn);
-		StoreConsignmentIn storeConsignmentInEntity = storeConsignmentInService.getById(storeConsignmentIn.getId());
-		if(storeConsignmentInEntity==null) {
-			return Result.error("未找到对应数据");
-		}
-		storeConsignmentInService.updateMain(storeConsignmentIn, storeConsignmentInPage.getStoreConsignmentInDetailsList(),storeConsignmentInPage.getStoreConsignmentInShipList());
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "寄存代发入库主表-通过id删除")
-	@ApiOperation(value="寄存代发入库主表-通过id删除", notes="寄存代发入库主表-通过id删除")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody StoreConsignmentInPage storeConsignmentInPage) {
+        StoreConsignmentIn storeConsignmentIn = new StoreConsignmentIn();
+        BeanUtils.copyProperties(storeConsignmentInPage, storeConsignmentIn);
+        StoreConsignmentIn storeConsignmentInEntity = storeConsignmentInService.getById(storeConsignmentIn.getId());
+        if (storeConsignmentInEntity == null) {
+            return Result.error("未找到对应数据");
+        }
+        storeConsignmentInService.updateMain(storeConsignmentIn, storeConsignmentInPage.getStoreConsignmentInDetailsList(), storeConsignmentInPage.getStoreConsignmentInShipList());
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "寄存代发入库主表-通过id删除")
+    @ApiOperation(value = "寄存代发入库主表-通过id删除", notes = "寄存代发入库主表-通过id删除")
     @RequiresPermissions("storeCode:store_consignment_in:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-
-		StoreConsignmentIn storeConsignmentIn = storeConsignmentInService.getById(id);
-		if(storeConsignmentIn==null) {
-			return Result.error("未找到对应数据");
-		}
-
-		String submit = storeConsignmentIn.getSubmit();
-		if (StringUtils.isNotBlank(submit) && submit.equals("1")) {
-			return Result.error("已提交的数据无法删除");
-		}
-
-		storeConsignmentInService.delMain(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "寄存代发入库主表-批量删除")
-	@ApiOperation(value="寄存代发入库主表-批量删除", notes="寄存代发入库主表-批量删除")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+
+        StoreConsignmentIn storeConsignmentIn = storeConsignmentInService.getById(id);
+        if (storeConsignmentIn == null) {
+            return Result.error("未找到对应数据");
+        }
+
+        String submit = storeConsignmentIn.getSubmit();
+        if (StringUtils.isNotBlank(submit) && submit.equals("1")) {
+            return Result.error("已提交的数据无法删除");
+        }
+
+        storeConsignmentInService.delMain(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "寄存代发入库主表-批量删除")
+    @ApiOperation(value = "寄存代发入库主表-批量删除", notes = "寄存代发入库主表-批量删除")
     @RequiresPermissions("storeCode:store_consignment_in:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-
-		for (String o : ids.split(",")) {
-
-			StoreConsignmentIn order = storeConsignmentInService.getById(o);
-			if (order == null) {
-				return Result.error("未找到对应数据");
-			}
-
-			String submit = order.getSubmit();
-			if (StringUtils.isNotBlank(submit) && submit.equals("1")) {
-				return Result.error("单号" + order.getBillCode() + "已提交,无法删除");
-			}
-		}
-
-		this.storeConsignmentInService.delBatchMain(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功！");
-	}
-
-	 /**
-	  * 批量提交
-	  *
-	  * @param ids
-	  * @return
-	  */
-	 @AutoLog(value = "寄存代发入库-批量提交")
-	 @ApiOperation(value = "寄存代发入库-批量提交", notes = "寄存代发入库-批量提交")
-	 @GetMapping(value = "/submitBatch")
-	 public Result<String> submitBatch(@RequestParam(name = "ids", required = true) String ids) {
-
-		 return storeConsignmentInService.submitBatch(ids);
-	 }
-
-	 /**
-	  * 批量取消提交
-	  *
-	  * @param ids
-	  * @return
-	  */
-	 @AutoLog(value = "寄存代发入库-批量取消提交")
-	 @ApiOperation(value = "寄存代发入库-批量取消提交", notes = "寄存代发入库-批量取消提交")
-	 @GetMapping(value = "/returnSubmitBatch")
-	 public Result<String> returnSubmitBatch(@RequestParam(name = "ids", required = true) String ids) {
-
-		 return storeConsignmentInService.returnSubmitBatch(ids);
-	 }
-
-	 /**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "寄存代发入库主表-通过id查询")
-	@ApiOperation(value="寄存代发入库主表-通过id查询", notes="寄存代发入库主表-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<StoreConsignmentIn> queryById(@RequestParam(name="id",required=true) String id) {
-		StoreConsignmentIn storeConsignmentIn = storeConsignmentInService.getById(id);
-		if(storeConsignmentIn==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(storeConsignmentIn);
-
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "寄存代发入库-子表产品明细通过主表ID查询")
-	@ApiOperation(value="寄存代发入库-子表产品明细主表ID查询", notes="寄存代发入库-子表产品明细-通主表ID查询")
-	@GetMapping(value = "/queryStoreConsignmentInDetailsByMainId")
-	public Result<List<StoreConsignmentInDetails>> queryStoreConsignmentInDetailsListByMainId(@RequestParam(name="id",required=true) String id) {
-		List<StoreConsignmentInDetails> storeConsignmentInDetailsList = storeConsignmentInDetailsService.selectByMainId(id);
-		return Result.OK(storeConsignmentInDetailsList);
-	}
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "寄存代发入库-子表船明细通过主表ID查询")
-	@ApiOperation(value="寄存代发入库-子表船明细主表ID查询", notes="寄存代发入库-子表船明细-通主表ID查询")
-	@GetMapping(value = "/queryStoreConsignmentInShipByMainId")
-	public Result<List<StoreConsignmentInShip>> queryStoreConsignmentInShipListByMainId(@RequestParam(name="id",required=true) String id) {
-		List<StoreConsignmentInShip> storeConsignmentInShipList = storeConsignmentInShipService.selectByMainId(id);
-		return Result.OK(storeConsignmentInShipList);
-	}
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+
+        for (String o : ids.split(",")) {
+
+            StoreConsignmentIn order = storeConsignmentInService.getById(o);
+            if (order == null) {
+                return Result.error("未找到对应数据");
+            }
+
+            String submit = order.getSubmit();
+            if (StringUtils.isNotBlank(submit) && submit.equals("1")) {
+                return Result.error("单号" + order.getBillCode() + "已提交,无法删除");
+            }
+        }
+
+        this.storeConsignmentInService.delBatchMain(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功！");
+    }
+
+    /**
+     * 批量提交
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "寄存代发入库-批量提交")
+    @ApiOperation(value = "寄存代发入库-批量提交", notes = "寄存代发入库-批量提交")
+    @GetMapping(value = "/submitBatch")
+    public Result<String> submitBatch(@RequestParam(name = "ids", required = true) String ids) {
+
+        return storeConsignmentInService.submitBatch(ids);
+    }
+
+    /**
+     * 批量取消提交
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "寄存代发入库-批量取消提交")
+    @ApiOperation(value = "寄存代发入库-批量取消提交", notes = "寄存代发入库-批量取消提交")
+    @GetMapping(value = "/returnSubmitBatch")
+    public Result<String> returnSubmitBatch(@RequestParam(name = "ids", required = true) String ids) {
+
+        return storeConsignmentInService.returnSubmitBatch(ids);
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "寄存代发入库主表-通过id查询")
+    @ApiOperation(value = "寄存代发入库主表-通过id查询", notes = "寄存代发入库主表-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<StoreConsignmentIn> queryById(@RequestParam(name = "id", required = true) String id) {
+        StoreConsignmentIn storeConsignmentIn = storeConsignmentInService.getById(id);
+        if (storeConsignmentIn == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(storeConsignmentIn);
+
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "寄存代发入库-子表产品明细通过主表ID查询")
+    @ApiOperation(value = "寄存代发入库-子表产品明细主表ID查询", notes = "寄存代发入库-子表产品明细-通主表ID查询")
+    @GetMapping(value = "/queryStoreConsignmentInDetailsByMainId")
+    public Result<List<StoreConsignmentInDetails>> queryStoreConsignmentInDetailsListByMainId(@RequestParam(name = "id", required = true) String id) {
+        List<StoreConsignmentInDetails> storeConsignmentInDetailsList = storeConsignmentInDetailsService.selectByMainId(id);
+        return Result.OK(storeConsignmentInDetailsList);
+    }
 
     /**
-    * 导出excel
-    *
-    * @param request
-    * @param storeConsignmentIn
-    */
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "寄存代发入库-子表船明细通过主表ID查询")
+    @ApiOperation(value = "寄存代发入库-子表船明细主表ID查询", notes = "寄存代发入库-子表船明细-通主表ID查询")
+    @GetMapping(value = "/queryStoreConsignmentInShipByMainId")
+    public Result<List<StoreConsignmentInShip>> queryStoreConsignmentInShipListByMainId(@RequestParam(name = "id", required = true) String id) {
+        List<StoreConsignmentInShip> storeConsignmentInShipList = storeConsignmentInShipService.selectByMainId(id);
+        return Result.OK(storeConsignmentInShipList);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param storeConsignmentIn
+     */
     @RequiresPermissions("storeCode:store_consignment_in:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, StoreConsignmentIn storeConsignmentIn) {
-      // Step.1 组装查询条件查询数据
-      QueryWrapper<StoreConsignmentIn> queryWrapper = QueryGenerator.initQueryWrapper(storeConsignmentIn, request.getParameterMap());
-      LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-
-      //配置选中数据查询条件
-      String selections = request.getParameter("selections");
-      if(oConvertUtils.isNotEmpty(selections)) {
-         List<String> selectionList = Arrays.asList(selections.split(","));
-         queryWrapper.in("id",selectionList);
-      }
-      //Step.2 获取导出数据
-      List<StoreConsignmentIn> storeConsignmentInList = storeConsignmentInService.list(queryWrapper);
-
-      // Step.3 组装pageList
-      List<StoreConsignmentInPage> pageList = new ArrayList<StoreConsignmentInPage>();
-      for (StoreConsignmentIn main : storeConsignmentInList) {
-          StoreConsignmentInPage vo = new StoreConsignmentInPage();
-          BeanUtils.copyProperties(main, vo);
-          List<StoreConsignmentInDetails> storeConsignmentInDetailsList = storeConsignmentInDetailsService.selectByMainId(main.getId());
-          vo.setStoreConsignmentInDetailsList(storeConsignmentInDetailsList);
-          List<StoreConsignmentInShip> storeConsignmentInShipList = storeConsignmentInShipService.selectByMainId(main.getId());
-          vo.setStoreConsignmentInShipList(storeConsignmentInShipList);
-          pageList.add(vo);
-      }
-
-      // Step.4 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      mv.addObject(NormalExcelConstants.FILE_NAME, "寄存代发入库主表列表");
-      mv.addObject(NormalExcelConstants.CLASS, StoreConsignmentInPage.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("寄存代发入库主表数据", "导出人:"+sysUser.getRealname(), "寄存代发入库主表"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
+        // Step.1 组装查询条件查询数据
+        QueryWrapper<StoreConsignmentIn> queryWrapper = QueryGenerator.initQueryWrapper(storeConsignmentIn, request.getParameterMap());
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+        //配置选中数据查询条件
+        String selections = request.getParameter("selections");
+        if (oConvertUtils.isNotEmpty(selections)) {
+            List<String> selectionList = Arrays.asList(selections.split(","));
+            queryWrapper.in("id", selectionList);
+        }
+        //Step.2 获取导出数据
+        List<StoreConsignmentIn> storeConsignmentInList = storeConsignmentInService.list(queryWrapper);
+
+        // Step.3 组装pageList
+        List<StoreConsignmentInPage> pageList = new ArrayList<StoreConsignmentInPage>();
+        for (StoreConsignmentIn main : storeConsignmentInList) {
+            StoreConsignmentInPage vo = new StoreConsignmentInPage();
+            BeanUtils.copyProperties(main, vo);
+            List<StoreConsignmentInDetails> storeConsignmentInDetailsList = storeConsignmentInDetailsService.selectByMainId(main.getId());
+            vo.setStoreConsignmentInDetailsList(storeConsignmentInDetailsList);
+            List<StoreConsignmentInShip> storeConsignmentInShipList = storeConsignmentInShipService.selectByMainId(main.getId());
+            vo.setStoreConsignmentInShipList(storeConsignmentInShipList);
+            pageList.add(vo);
+        }
+
+        // Step.4 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        mv.addObject(NormalExcelConstants.FILE_NAME, "寄存代发入库主表列表");
+        mv.addObject(NormalExcelConstants.CLASS, StoreConsignmentInPage.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("寄存代发入库主表数据", "导出人:" + sysUser.getRealname(), "寄存代发入库主表"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
     }
 
     /**
-    * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
     @RequiresPermissions("storeCode:store_consignment_in:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          // 获取上传文件对象
-          MultipartFile file = entity.getValue();
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<StoreConsignmentInPage> list = ExcelImportUtil.importExcel(file.getInputStream(), StoreConsignmentInPage.class, params);
-              for (StoreConsignmentInPage page : list) {
-                  StoreConsignmentIn po = new StoreConsignmentIn();
-                  BeanUtils.copyProperties(page, po);
-                  storeConsignmentInService.saveMain(po, page.getStoreConsignmentInDetailsList(),page.getStoreConsignmentInShipList());
-              }
-              return Result.OK("文件导入成功！数据行数:" + list.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.OK("文件导入失败！");
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            // 获取上传文件对象
+            MultipartFile file = entity.getValue();
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<StoreConsignmentInPage> list = ExcelImportUtil.importExcel(file.getInputStream(), StoreConsignmentInPage.class, params);
+                for (StoreConsignmentInPage page : list) {
+                    StoreConsignmentIn po = new StoreConsignmentIn();
+                    BeanUtils.copyProperties(page, po);
+                    storeConsignmentInService.saveMain(po, page.getStoreConsignmentInDetailsList(), page.getStoreConsignmentInShipList());
+                }
+                return Result.OK("文件导入成功！数据行数:" + list.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.OK("文件导入失败！");
     }
 
 }

srm-module-code/src/main/java/org/jeecg/modules/storeCode/controller/StoreConsignmentOutController.java

@@ -49,300 +49,300 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
 
- /**
+/**
  * @Description: 寄存代发出库-主表
  * @Author: jeecg-boot
- * @Date:   2025-05-14
+ * @Date: 2025-05-14
  * @Version: V1.0
  */
-@Api(tags="寄存代发出库-主表")
+@Api(tags = "寄存代发出库-主表")
 @RestController
 @RequestMapping("/storeCode/storeConsignmentOut")
 @Slf4j
 public class StoreConsignmentOutController {
-	@Autowired
-	private IStoreConsignmentOutService storeConsignmentOutService;
-	@Autowired
-	private IStoreConsignmentOutDetailsService storeConsignmentOutDetailsService;
-	 @Autowired
-	 private ISerialPatternService serialPatternService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param storeConsignmentOut
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "寄存代发出库-主表-分页列表查询")
-	@ApiOperation(value="寄存代发出库-主表-分页列表查询", notes="寄存代发出库-主表-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<StoreConsignmentOut>> queryPageList(StoreConsignmentOut storeConsignmentOut,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
+    @Autowired
+    private IStoreConsignmentOutService storeConsignmentOutService;
+    @Autowired
+    private IStoreConsignmentOutDetailsService storeConsignmentOutDetailsService;
+    @Autowired
+    private ISerialPatternService serialPatternService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param storeConsignmentOut
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "寄存代发出库-主表-分页列表查询")
+    @ApiOperation(value = "寄存代发出库-主表-分页列表查询", notes = "寄存代发出库-主表-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<StoreConsignmentOut>> queryPageList(StoreConsignmentOut storeConsignmentOut,
+                                                            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                            HttpServletRequest req) {
         // 自定义查询规则
         Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
         // 自定义多选的查询规则为：LIKE_WITH_OR
         customeRuleMap.put("submit", QueryRuleEnum.LIKE_WITH_OR);
-        QueryWrapper<StoreConsignmentOut> queryWrapper = QueryGenerator.initQueryWrapper(storeConsignmentOut, req.getParameterMap(),customeRuleMap);
-		Page<StoreConsignmentOut> page = new Page<StoreConsignmentOut>(pageNo, pageSize);
-		IPage<StoreConsignmentOut> pageList = storeConsignmentOutService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param storeConsignmentOutPage
-	 * @return
-	 */
-	@AutoLog(value = "寄存代发出库-主表-添加")
-	@ApiOperation(value="寄存代发出库-主表-添加", notes="寄存代发出库-主表-添加")
+        QueryWrapper<StoreConsignmentOut> queryWrapper = QueryGenerator.initQueryWrapper(storeConsignmentOut, req.getParameterMap(), customeRuleMap);
+        Page<StoreConsignmentOut> page = new Page<StoreConsignmentOut>(pageNo, pageSize);
+        IPage<StoreConsignmentOut> pageList = storeConsignmentOutService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param storeConsignmentOutPage
+     * @return
+     */
+    @AutoLog(value = "寄存代发出库-主表-添加")
+    @ApiOperation(value = "寄存代发出库-主表-添加", notes = "寄存代发出库-主表-添加")
     @RequiresPermissions("storeCode:store_consignment_out:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody StoreConsignmentOutPage storeConsignmentOutPage) {
-		StoreConsignmentOut storeConsignmentOut = new StoreConsignmentOut();
-		BeanUtils.copyProperties(storeConsignmentOutPage, storeConsignmentOut);
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody StoreConsignmentOutPage storeConsignmentOutPage) {
+        StoreConsignmentOut storeConsignmentOut = new StoreConsignmentOut();
+        BeanUtils.copyProperties(storeConsignmentOutPage, storeConsignmentOut);
+
+        String code = storeConsignmentOut.getBillCode();
+        if (StringUtils.isNotBlank(code)) {
 
-		String code = storeConsignmentOut.getBillCode();
-		if (StringUtils.isNotBlank(code)) {
+            QueryWrapper<StoreConsignmentOut> queryWrapper = new QueryWrapper();
+            queryWrapper.eq("bill_code", code);
+            queryWrapper.eq("del_flag", "0");
 
-			QueryWrapper<StoreConsignmentOut> queryWrapper = new QueryWrapper();
-			queryWrapper.eq("bill_code", code);
-			queryWrapper.eq("del_flag", "0");
+            List<StoreConsignmentOut> list = storeConsignmentOutService.list(queryWrapper);
+            if (list.size() != 0) {
+                return Result.error("寄存代发出库编码重复，请修改！");
+            }
+        } else {
 
-			List<StoreConsignmentOut> list = storeConsignmentOutService.list(queryWrapper);
-			if (list.size() != 0) {
-				return Result.error("寄存代发出库编码重复，请修改！");
-			}
-		} else {
+            Result<String> result = serialPatternService.getNextSerial("store_consignment_out", "bill_code");
+            if (!result.isSuccess()) {
+                return result;
+            }
+            storeConsignmentOut.setBillCode(result.getMessage());
+        }
+        storeConsignmentOutService.saveMain(storeConsignmentOut, storeConsignmentOutPage.getStoreConsignmentOutDetailsList());
+        return Result.OK("添加成功！");
+    }
 
-			Result<String> result = serialPatternService.getNextSerial("store_consignment_out", "bill_code");
-			if (!result.isSuccess()) {
-				return result;
-			}
-			storeConsignmentOut.setBillCode(result.getMessage());
-		}
-		storeConsignmentOutService.saveMain(storeConsignmentOut, storeConsignmentOutPage.getStoreConsignmentOutDetailsList());
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param storeConsignmentOutPage
-	 * @return
-	 */
-	@AutoLog(value = "寄存代发出库-主表-编辑")
-	@ApiOperation(value="寄存代发出库-主表-编辑", notes="寄存代发出库-主表-编辑")
+    /**
+     * 编辑
+     *
+     * @param storeConsignmentOutPage
+     * @return
+     */
+    @AutoLog(value = "寄存代发出库-主表-编辑")
+    @ApiOperation(value = "寄存代发出库-主表-编辑", notes = "寄存代发出库-主表-编辑")
     @RequiresPermissions("storeCode:store_consignment_out:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody StoreConsignmentOutPage storeConsignmentOutPage) {
-		StoreConsignmentOut storeConsignmentOut = new StoreConsignmentOut();
-		BeanUtils.copyProperties(storeConsignmentOutPage, storeConsignmentOut);
-		StoreConsignmentOut storeConsignmentOutEntity = storeConsignmentOutService.getById(storeConsignmentOut.getId());
-		if(storeConsignmentOutEntity==null) {
-			return Result.error("未找到对应数据");
-		}
-		storeConsignmentOutService.updateMain(storeConsignmentOut, storeConsignmentOutPage.getStoreConsignmentOutDetailsList());
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "寄存代发出库-主表-通过id删除")
-	@ApiOperation(value="寄存代发出库-主表-通过id删除", notes="寄存代发出库-主表-通过id删除")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody StoreConsignmentOutPage storeConsignmentOutPage) {
+        StoreConsignmentOut storeConsignmentOut = new StoreConsignmentOut();
+        BeanUtils.copyProperties(storeConsignmentOutPage, storeConsignmentOut);
+        StoreConsignmentOut storeConsignmentOutEntity = storeConsignmentOutService.getById(storeConsignmentOut.getId());
+        if (storeConsignmentOutEntity == null) {
+            return Result.error("未找到对应数据");
+        }
+        storeConsignmentOutService.updateMain(storeConsignmentOut, storeConsignmentOutPage.getStoreConsignmentOutDetailsList());
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "寄存代发出库-主表-通过id删除")
+    @ApiOperation(value = "寄存代发出库-主表-通过id删除", notes = "寄存代发出库-主表-通过id删除")
     @RequiresPermissions("storeCode:store_consignment_out:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		StoreConsignmentOut storeConsignmentOut = storeConsignmentOutService.getById(id);
-		if(storeConsignmentOut==null) {
-			return Result.error("未找到对应数据");
-		}
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        StoreConsignmentOut storeConsignmentOut = storeConsignmentOutService.getById(id);
+        if (storeConsignmentOut == null) {
+            return Result.error("未找到对应数据");
+        }
+
+        String submit = storeConsignmentOut.getSubmit();
+        if (StringUtils.isNotBlank(submit) && submit.equals("1")) {
+            return Result.error("已提交的数据无法删除");
+        }
 
-		String submit = storeConsignmentOut.getSubmit();
-		if (StringUtils.isNotBlank(submit) && submit.equals("1")) {
-			return Result.error("已提交的数据无法删除");
-		}
+        storeConsignmentOutService.delMain(id);
+        return Result.OK("删除成功!");
+    }
 
-		storeConsignmentOutService.delMain(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "寄存代发出库-主表-批量删除")
-	@ApiOperation(value="寄存代发出库-主表-批量删除", notes="寄存代发出库-主表-批量删除")
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "寄存代发出库-主表-批量删除")
+    @ApiOperation(value = "寄存代发出库-主表-批量删除", notes = "寄存代发出库-主表-批量删除")
     @RequiresPermissions("storeCode:store_consignment_out:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		for (String o : ids.split(",")) {
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        for (String o : ids.split(",")) {
+
+            StoreConsignmentOut storeConsignmentOut = storeConsignmentOutService.getById(o);
+            if (storeConsignmentOut == null) {
+                return Result.error("未找到对应数据");
+            }
 
-			StoreConsignmentOut storeConsignmentOut = storeConsignmentOutService.getById(o);
-			if(storeConsignmentOut==null) {
-				return Result.error("未找到对应数据");
-			}
+            String submit = storeConsignmentOut.getSubmit();
+            if (StringUtils.isNotBlank(submit) && submit.equals("1")) {
+                return Result.error("单号" + storeConsignmentOut.getBillCode() + "已提交,无法删除");
+            }
+        }
+        this.storeConsignmentOutService.delBatchMain(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功！");
+    }
 
-			String submit = storeConsignmentOut.getSubmit();
-			if (StringUtils.isNotBlank(submit) && submit.equals("1")) {
-				return Result.error("单号" + storeConsignmentOut.getBillCode() + "已提交,无法删除");
-			}
-		}
-		this.storeConsignmentOutService.delBatchMain(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功！");
-	}
+    /**
+     * 批量提交
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "寄存代发出库-批量提交")
+    @ApiOperation(value = "寄存代发出库-批量提交", notes = "寄存代发出库-批量提交")
+    @GetMapping(value = "/submitBatch")
+    public Result<String> submitBatch(@RequestParam(name = "ids", required = true) String ids) {
 
-	 /**
-	  * 批量提交
-	  *
-	  * @param ids
-	  * @return
-	  */
-	 @AutoLog(value = "寄存代发出库-批量提交")
-	 @ApiOperation(value = "寄存代发出库-批量提交", notes = "寄存代发出库-批量提交")
-	 @GetMapping(value = "/submitBatch")
-	 public Result<String> submitBatch(@RequestParam(name = "ids", required = true) String ids) {
+        return storeConsignmentOutService.submitBatch(ids);
+    }
 
-		 return storeConsignmentOutService.submitBatch(ids);
-	 }
+    /**
+     * 批量取消提交
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "寄存代发出库-批量取消提交")
+    @ApiOperation(value = "寄存代发出库-批量取消提交", notes = "寄存代发出库-批量取消提交")
+    @GetMapping(value = "/returnSubmitBatch")
+    public Result<String> returnSubmitBatch(@RequestParam(name = "ids", required = true) String ids) {
 
-	 /**
-	  * 批量取消提交
-	  *
-	  * @param ids
-	  * @return
-	  */
-	 @AutoLog(value = "寄存代发出库-批量取消提交")
-	 @ApiOperation(value = "寄存代发出库-批量取消提交", notes = "寄存代发出库-批量取消提交")
-	 @GetMapping(value = "/returnSubmitBatch")
-	 public Result<String> returnSubmitBatch(@RequestParam(name = "ids", required = true) String ids) {
+        return storeConsignmentOutService.returnSubmitBatch(ids);
+    }
 
-		 return storeConsignmentOutService.returnSubmitBatch(ids);
-	 }
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "寄存代发出库-主表-通过id查询")
+    @ApiOperation(value = "寄存代发出库-主表-通过id查询", notes = "寄存代发出库-主表-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<StoreConsignmentOut> queryById(@RequestParam(name = "id", required = true) String id) {
+        StoreConsignmentOut storeConsignmentOut = storeConsignmentOutService.getById(id);
+        if (storeConsignmentOut == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(storeConsignmentOut);
 
-	 /**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "寄存代发出库-主表-通过id查询")
-	@ApiOperation(value="寄存代发出库-主表-通过id查询", notes="寄存代发出库-主表-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<StoreConsignmentOut> queryById(@RequestParam(name="id",required=true) String id) {
-		StoreConsignmentOut storeConsignmentOut = storeConsignmentOutService.getById(id);
-		if(storeConsignmentOut==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(storeConsignmentOut);
+    }
 
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "寄存代发出库-子表明细通过主表ID查询")
-	@ApiOperation(value="寄存代发出库-子表明细主表ID查询", notes="寄存代发出库-子表明细-通主表ID查询")
-	@GetMapping(value = "/queryStoreConsignmentOutDetailsByMainId")
-	public Result<List<StoreConsignmentOutDetails>> queryStoreConsignmentOutDetailsListByMainId(@RequestParam(name="id",required=true) String id) {
-		List<StoreConsignmentOutDetails> storeConsignmentOutDetailsList = storeConsignmentOutDetailsService.selectByMainId(id);
-		return Result.OK(storeConsignmentOutDetailsList);
-	}
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "寄存代发出库-子表明细通过主表ID查询")
+    @ApiOperation(value = "寄存代发出库-子表明细主表ID查询", notes = "寄存代发出库-子表明细-通主表ID查询")
+    @GetMapping(value = "/queryStoreConsignmentOutDetailsByMainId")
+    public Result<List<StoreConsignmentOutDetails>> queryStoreConsignmentOutDetailsListByMainId(@RequestParam(name = "id", required = true) String id) {
+        List<StoreConsignmentOutDetails> storeConsignmentOutDetailsList = storeConsignmentOutDetailsService.selectByMainId(id);
+        return Result.OK(storeConsignmentOutDetailsList);
+    }
 
     /**
-    * 导出excel
-    *
-    * @param request
-    * @param storeConsignmentOut
-    */
+     * 导出excel
+     *
+     * @param request
+     * @param storeConsignmentOut
+     */
     @RequiresPermissions("storeCode:store_consignment_out:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, StoreConsignmentOut storeConsignmentOut) {
-      // Step.1 组装查询条件查询数据
-      QueryWrapper<StoreConsignmentOut> queryWrapper = QueryGenerator.initQueryWrapper(storeConsignmentOut, request.getParameterMap());
-      LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        // Step.1 组装查询条件查询数据
+        QueryWrapper<StoreConsignmentOut> queryWrapper = QueryGenerator.initQueryWrapper(storeConsignmentOut, request.getParameterMap());
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
-      //配置选中数据查询条件
-      String selections = request.getParameter("selections");
-      if(oConvertUtils.isNotEmpty(selections)) {
-         List<String> selectionList = Arrays.asList(selections.split(","));
-         queryWrapper.in("id",selectionList);
-      }
-      //Step.2 获取导出数据
-      List<StoreConsignmentOut> storeConsignmentOutList = storeConsignmentOutService.list(queryWrapper);
+        //配置选中数据查询条件
+        String selections = request.getParameter("selections");
+        if (oConvertUtils.isNotEmpty(selections)) {
+            List<String> selectionList = Arrays.asList(selections.split(","));
+            queryWrapper.in("id", selectionList);
+        }
+        //Step.2 获取导出数据
+        List<StoreConsignmentOut> storeConsignmentOutList = storeConsignmentOutService.list(queryWrapper);
 
-      // Step.3 组装pageList
-      List<StoreConsignmentOutPage> pageList = new ArrayList<StoreConsignmentOutPage>();
-      for (StoreConsignmentOut main : storeConsignmentOutList) {
-          StoreConsignmentOutPage vo = new StoreConsignmentOutPage();
-          BeanUtils.copyProperties(main, vo);
-          List<StoreConsignmentOutDetails> storeConsignmentOutDetailsList = storeConsignmentOutDetailsService.selectByMainId(main.getId());
-          vo.setStoreConsignmentOutDetailsList(storeConsignmentOutDetailsList);
-          pageList.add(vo);
-      }
+        // Step.3 组装pageList
+        List<StoreConsignmentOutPage> pageList = new ArrayList<StoreConsignmentOutPage>();
+        for (StoreConsignmentOut main : storeConsignmentOutList) {
+            StoreConsignmentOutPage vo = new StoreConsignmentOutPage();
+            BeanUtils.copyProperties(main, vo);
+            List<StoreConsignmentOutDetails> storeConsignmentOutDetailsList = storeConsignmentOutDetailsService.selectByMainId(main.getId());
+            vo.setStoreConsignmentOutDetailsList(storeConsignmentOutDetailsList);
+            pageList.add(vo);
+        }
 
-      // Step.4 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      mv.addObject(NormalExcelConstants.FILE_NAME, "寄存代发出库-主表列表");
-      mv.addObject(NormalExcelConstants.CLASS, StoreConsignmentOutPage.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("寄存代发出库-主表数据", "导出人:"+sysUser.getRealname(), "寄存代发出库-主表"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
+        // Step.4 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        mv.addObject(NormalExcelConstants.FILE_NAME, "寄存代发出库-主表列表");
+        mv.addObject(NormalExcelConstants.CLASS, StoreConsignmentOutPage.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("寄存代发出库-主表数据", "导出人:" + sysUser.getRealname(), "寄存代发出库-主表"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
     }
 
     /**
-    * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
     @RequiresPermissions("storeCode:store_consignment_out:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          // 获取上传文件对象
-          MultipartFile file = entity.getValue();
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<StoreConsignmentOutPage> list = ExcelImportUtil.importExcel(file.getInputStream(), StoreConsignmentOutPage.class, params);
-              for (StoreConsignmentOutPage page : list) {
-                  StoreConsignmentOut po = new StoreConsignmentOut();
-                  BeanUtils.copyProperties(page, po);
-                  storeConsignmentOutService.saveMain(po, page.getStoreConsignmentOutDetailsList());
-              }
-              return Result.OK("文件导入成功！数据行数:" + list.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.OK("文件导入失败！");
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            // 获取上传文件对象
+            MultipartFile file = entity.getValue();
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<StoreConsignmentOutPage> list = ExcelImportUtil.importExcel(file.getInputStream(), StoreConsignmentOutPage.class, params);
+                for (StoreConsignmentOutPage page : list) {
+                    StoreConsignmentOut po = new StoreConsignmentOut();
+                    BeanUtils.copyProperties(page, po);
+                    storeConsignmentOutService.saveMain(po, page.getStoreConsignmentOutDetailsList());
+                }
+                return Result.OK("文件导入成功！数据行数:" + list.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.OK("文件导入失败！");
     }
 
 }