wms / wms4_shandongtaikai · Commits

Commit 7a154812e392a47f4250a533effda454bc84fc62

Authored by 谭毅彬
1 parent e4ec0bad

多仓支持提交（2） 

Signed-off-by: TanYibin <5491541@qq.com>
Inline Side-by-side
Showing 7 changed files with 39 additions and 42 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/ngalain/aop/LogRecordAspect.java
  View file @7a15481
... ... @@ -34,9 +34,9 @@ public class LogRecordAspect {
34 34 // 获取请求的request
35 35 HttpServletRequest request = attributes.getRequest();
36 36 String url = request.getRequestURL().toString();
37   - String queryString = request.getQueryString();
38   - log.info("[Controller start] {}{}[{}][{}]", url, StringUtils.isEmpty(queryString) ? "" : "?" + queryString, request.getMethod(),
39   - ApiLoggerAspect.getIpAddr(request));
  37 + String className = point.getTarget().getClass().getName();
  38 + String methodName = point.getSignature().getName();
  39 + log.info("[Controller start] {}[{}][{}]\r\n{}.{}", url, request.getMethod(), ApiLoggerAspect.getIpAddr(request), className, methodName);
40 40 // result的值就是被拦截方法的返回值
41 41 Object result = point.proceed();
42 42 long callTime = System.currentTimeMillis() - startTime;
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/customer/controller/CustomerController.java
  View file @7a15481
... ... @@ -72,8 +72,7 @@ public class CustomerController extends JeecgController&lt;Customer, ICustomerServi
72 72 @GetMapping(value = "/list")
73 73 public Result<IPage<Customer>> queryPageList(Customer customer, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
74 74 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
75   - String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
76   - customer.setWarehouseCode(warehouseCode);
  75 + HuahengJwtUtil.setWarehouseCode(req, customer);
77 76 QueryWrapper<Customer> queryWrapper = QueryGenerator.initQueryWrapper(customer, req.getParameterMap());
78 77 Page<Customer> page = new Page<Customer>(pageNo, pageSize);
79 78 IPage<Customer> pageList = customerService.page(page, queryWrapper);
... ... @@ -90,10 +89,7 @@ public class CustomerController extends JeecgController&lt;Customer, ICustomerServi
90 89 @PostMapping(value = "/add")
91 90 @RequiresPermissions("customer:add")
92 91 public Result<String> add(@RequestBody Customer customer, HttpServletRequest req) {
93   - String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
94   - if (StringUtils.isNotEmpty(warehouseCode)) {
95   - customer.setWarehouseCode(warehouseCode);
96   - }
  92 + HuahengJwtUtil.setWarehouseCode(req, customer);
97 93 customerService.save(customer);
98 94 return Result.OK("添加成功！");
99 95 }
... ... @@ -183,9 +179,8 @@ public class CustomerController extends JeecgController&lt;Customer, ICustomerServi
183 179 */
184 180 @RequestMapping(value = "/getCustomerList")
185 181 public Result<?> getCustomerList(HttpServletRequest req) {
186   - String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
187 182 LambdaQueryWrapper<Customer> customerLambdaQueryWrapper = Wrappers.lambdaQuery();
188   - customerLambdaQueryWrapper.eq(Customer::getWarehouseCode, warehouseCode);
  183 + HuahengJwtUtil.setWarehouseCode(customerLambdaQueryWrapper, Customer.class, req);
189 184 List<Customer> customerList = customerService.list(customerLambdaQueryWrapper);
190 185 return Result.OK(customerList);
191 186 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/shipmentType/controller/ShipmentTypeController.java
  View file @7a15481
... ... @@ -86,10 +86,7 @@ public class ShipmentTypeController extends JeecgController&lt;ShipmentType, IShipm
86 86 @RequiresPermissions("shipmentType:add")
87 87 @PostMapping(value = "/add")
88 88 public Result<String> add(@RequestBody ShipmentType shipmentType, HttpServletRequest req) {
89   - String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
90   - if (StringUtils.isNotEmpty(warehouseCode)) {
91   - shipmentType.setWarehouseCode(warehouseCode);
92   - }
  89 + HuahengJwtUtil.setWarehouseCode(req, shipmentType);
93 90 shipmentTypeService.save(shipmentType);
94 91 return Result.OK("添加成功！");
95 92 }
... ... @@ -179,9 +176,8 @@ public class ShipmentTypeController extends JeecgController&lt;ShipmentType, IShipm
179 176 */
180 177 @RequestMapping(value = "/getShipmentTypeList")
181 178 public Result<?> getShipmentTypeList(HttpServletRequest req) {
182   - String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
183 179 LambdaQueryWrapper<ShipmentType> shipmentTypeLambdaQueryWrapper = Wrappers.lambdaQuery();
184   - shipmentTypeLambdaQueryWrapper.eq(ShipmentType::getWarehouseCode, warehouseCode);
  180 + HuahengJwtUtil.setWarehouseCode(shipmentTypeLambdaQueryWrapper, ShipmentType.class, req);
185 181 List<ShipmentType> shipmentTypeList = shipmentTypeService.list(shipmentTypeLambdaQueryWrapper);
186 182 return Result.OK(shipmentTypeList);
187 183 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/controller/InventoryHeaderController.java
  View file @7a15481
... ... @@ -75,8 +75,7 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
75 75 @GetMapping(value = "/list")
76 76 public Result<IPage<InventoryHeader>> queryPageList(InventoryHeader inventoryHeader, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
77 77 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
78   - String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
79   - inventoryHeader.setWarehouseCode(warehouseCode);
  78 + HuahengJwtUtil.setWarehouseCode(req, inventoryHeader);
80 79 QueryWrapper<InventoryHeader> queryWrapper = QueryGenerator.initQueryWrapper(inventoryHeader, req.getParameterMap());
81 80 Page<InventoryHeader> page = new Page<InventoryHeader>(pageNo, pageSize);
82 81 IPage<InventoryHeader> pageList = inventoryHeaderService.page(page, queryWrapper);
... ... @@ -92,10 +91,7 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
92 91 @ApiOperation(value = "库存表-添加", notes = "库存表-添加")
93 92 @PostMapping(value = "/add")
94 93 public Result<String> add(@RequestBody InventoryHeader inventoryHeader, HttpServletRequest req) {
95   - String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
96   - if (StringUtils.isNotEmpty(warehouseCode)) {
97   - inventoryHeader.setWarehouseCode(warehouseCode);
98   - }
  94 + HuahengJwtUtil.setWarehouseCode(req, inventoryHeader);
99 95 inventoryHeaderService.save(inventoryHeader);
100 96 return Result.OK("添加成功！");
101 97 }
... ... @@ -184,8 +180,7 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
184 180 @ApiOperation(value = "库存详情-添加", notes = "库存详情-添加")
185 181 @PostMapping(value = "/addInventoryDetail")
186 182 public Result<String> addInventoryDetail(@RequestBody InventoryDetail inventoryDetail, HttpServletRequest req) {
187   - String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
188   - inventoryDetail.setWarehouseCode(warehouseCode);
  183 + HuahengJwtUtil.setWarehouseCode(req, inventoryDetail);
189 184 inventoryDetailService.save(inventoryDetail);
190 185 return Result.OK("添加成功！");
191 186 }
... ... @@ -247,11 +242,11 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
247 242 String selections = request.getParameter("selections");
248 243 if (oConvertUtils.isNotEmpty(selections)) {
249 244 List<String> selectionList = Arrays.asList(selections.split(","));
250   - exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
  245 + exportList = pageList.stream().filter(item -> selectionList.contains(item.getId().toString())).collect(Collectors.toList());
251 246 } else {
252 247 exportList = pageList;
253 248 }
254   -
  249 +
255 250 // Step.3 AutoPoi 导出Excel
256 251 ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
257 252 mv.addObject(NormalExcelConstants.FILE_NAME, "库存详情"); // 此处设置的filename无效 ,前端会重更新设置一下
... ... @@ -274,7 +269,6 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
274 269 @GetMapping(value = "/freeList")
275 270 public Result<IPage<InventoryHeader>> freeList(InventoryHeader inventoryHeader, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
276 271 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
277   -
278 272 QueryWrapper<InventoryHeader> queryWrapper = QueryGenerator.initQueryWrapper(inventoryHeader, req.getParameterMap());
279 273 queryWrapper.eq("container_status", QuantityConstant.STATUS_CONTAINER_SOME);
280 274 Page<InventoryHeader> page = new Page<InventoryHeader>(pageNo, pageSize);
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/controller/ShipmentContainerHeaderController.java
  View file @7a15481
... ... @@ -76,8 +76,7 @@ public class ShipmentContainerHeaderController extends JeecgController&lt;ShipmentC
76 76 public Result<IPage<ShipmentContainerHeader>> queryPageList(ShipmentContainerHeader shipmentContainerHeader,
77 77 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
78 78 HttpServletRequest req) {
79   - String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
80   - shipmentContainerHeader.setWarehouseCode(warehouseCode);
  79 + HuahengJwtUtil.setWarehouseCode(req, shipmentContainerHeader);
81 80 QueryWrapper<ShipmentContainerHeader> queryWrapper = QueryGenerator.initQueryWrapper(shipmentContainerHeader, req.getParameterMap());
82 81 Page<ShipmentContainerHeader> page = new Page<ShipmentContainerHeader>(pageNo, pageSize);
83 82 IPage<ShipmentContainerHeader> pageList = shipmentContainerHeaderService.page(page, queryWrapper);
... ... @@ -94,10 +93,7 @@ public class ShipmentContainerHeaderController extends JeecgController&lt;ShipmentC
94 93 @PostMapping(value = "/add")
95 94 @RequiresPermissions("shipmentContainerHeader:add")
96 95 public Result<String> add(@RequestBody ShipmentContainerHeader shipmentContainerHeader, HttpServletRequest req) {
97   - String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
98   - if (StringUtils.isNotEmpty(warehouseCode)) {
99   - shipmentContainerHeader.setWarehouseCode(warehouseCode);
100   - }
  96 + HuahengJwtUtil.setWarehouseCode(req, shipmentContainerHeader);
101 97 shipmentContainerHeaderService.save(shipmentContainerHeader);
102 98 return Result.OK("添加成功！");
103 99 }
... ... @@ -174,8 +170,7 @@ public class ShipmentContainerHeaderController extends JeecgController&lt;ShipmentC
174 170 public Result<IPage<ShipmentContainerDetail>> listShipmentContainerDetailByMainId(ShipmentContainerDetail shipmentContainerDetail,
175 171 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
176 172 HttpServletRequest req) {
177   - String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
178   - shipmentContainerDetail.setWarehouseCode(warehouseCode);
  173 + HuahengJwtUtil.setWarehouseCode(req, shipmentContainerDetail);
179 174 QueryWrapper<ShipmentContainerDetail> queryWrapper = QueryGenerator.initQueryWrapper(shipmentContainerDetail, req.getParameterMap());
180 175 Page<ShipmentContainerDetail> page = new Page<ShipmentContainerDetail>(pageNo, pageSize);
181 176 IPage<ShipmentContainerDetail> pageList = shipmentContainerDetailService.page(page, queryWrapper);
... ... @@ -192,10 +187,7 @@ public class ShipmentContainerHeaderController extends JeecgController&lt;ShipmentC
192 187 @RequiresPermissions("shipmentContainerDetail:add")
193 188 @PostMapping(value = "/addShipmentContainerDetail")
194 189 public Result<String> addShipmentContainerDetail(@RequestBody ShipmentContainerDetail shipmentContainerDetail, HttpServletRequest req) {
195   - String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
196   - if (StringUtils.isEmpty(warehouseCode)) {
197   - shipmentContainerDetail.setWarehouseCode(warehouseCode);
198   - }
  190 + HuahengJwtUtil.setWarehouseCode(req, shipmentContainerDetail);
199 191 shipmentContainerDetailService.save(shipmentContainerDetail);
200 192 return Result.OK("添加成功！");
201 193 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeaderHistory/controller/ShipmentHeaderHistoryController.java
  View file @7a15481
... ... @@ -58,8 +58,7 @@ public class ShipmentHeaderHistoryController extends JeecgController&lt;ShipmentHea
58 58 public Result<IPage<ShipmentHeaderHistory>> queryPageList(ShipmentHeaderHistory shipmentHeaderHistory,
59 59 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
60 60 HttpServletRequest req) {
61   - String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
62   - shipmentHeaderHistory.setWarehouseCode(warehouseCode);
  61 + HuahengJwtUtil.setWarehouseCode(req, shipmentHeaderHistory);
63 62 QueryWrapper<ShipmentHeaderHistory> queryWrapper = QueryGenerator.initQueryWrapper(shipmentHeaderHistory, req.getParameterMap());
64 63 Page<ShipmentHeaderHistory> page = new Page<>(pageNo, pageSize);
65 64 IPage<ShipmentHeaderHistory> pageList = shipmentHeaderHistoryService.page(page, queryWrapper);
... ...
huaheng-wms-core/src/main/resources/log4jdbc.properties 0 → 100644
  View file @7a15481
  1 +log4jdbc.statement.warn=false
  2 +
  3 +log4jdbc.dump.booleanastruefalse=false
  4 +
  5 +log4jdbc.dump.sql.maxlinelength=0
  6 +
  7 +log4jdbc.dump.fulldebugstacktrace=false
  8 +
  9 +log4jdbc.dump.sql.select=true
  10 +log4jdbc.dump.sql.insert=true
  11 +log4jdbc.dump.sql.delete=true
  12 +log4jdbc.dump.sql.update=true
  13 +log4jdbc.dump.sql.create=true
  14 +
  15 +log4jdbc.dump.sql.addsemicolon=false
  16 +
  17 +log4jdbc.trim.sql=true
  18 +
  19 +log4jdbc.trim.sql.extrablanklines=true
  20 +
  21 +log4jdbc.suppress.generated.keys.exception=false
0 22 \ No newline at end of file
... ...