wms / wms4 · Commits

Commit 7a56e557ed6c40d5438649fdce8e685c589c3bf6

Authored by 肖超群
2 parents 05df9d55 63841495

Merge branch 'develop' of http://git.huahengcloud.com/wms/wms4 into develop

Inline Side-by-side
Showing 2 changed files with 43 additions and 27 deletions
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
  View file @7a56e55
... ... @@ -228,7 +228,7 @@
228 228 <a-menu-item v-if="(record.firstStatus >= 15 && record.firstStatus != '20' && record.lastStatus < 800) || (flowOff == '0' && record.lastStatus <= 200)" v-has="'shipmentHeader:autoShipment'">
229 229 <a @click="autoShipment(record)" type="primary">自动出库</a>
230 230 </a-menu-item>
231   - <a-menu-item v-if="(record.firstStatus >= 15 && record.firstStatus != '20' && record.lastStatus < 800) || (flowOff == '0' && record.lastStatus <= 200)" v-has="'shipmentHeader:autoShipment'">
  231 + <a-menu-item v-if="(record.firstStatus >= 15 && record.firstStatus != '20' && record.lastStatus < 800) || (flowOff == '0' && record.lastStatus <= 200)" v-has="'shipmentHeader:autoShipmentAdvice'">
232 232 <a @click="autoShipmentAdvice(record)" type="primary">预配盘出库</a>
233 233 </a-menu-item>
234 234 <a-menu-item v-has="'shipmentHeader:edit'" v-if="record.firstStatus == 0 && record.lastStatus == 0 && record.referCode == null">
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/controller/InventoryHeaderController.java
  View file @7a56e55
... ... @@ -53,9 +53,9 @@ import lombok.extern.slf4j.Slf4j;
53 53  
54 54 /**
55 55 * @Description: 库存表
56   - * @Author: jeecg-boot
57   - * @Date: 2022-11-16
58   - * @Version: V1.0
  56 + * @Author: jeecg-boot
  57 + * @Date: 2022-11-16
  58 + * @Version: V1.0
59 59 */
60 60 @Api(tags = "库存表")
61 61 @RestController
... ... @@ -75,17 +75,18 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
75 75  
76 76 /**
77 77 * 分页列表查询
78   - * @param inventoryHeader
79   - * @param pageNo
80   - * @param pageSize
81   - * @param req
  78 + *
  79 + * @param inventoryHeader
  80 + * @param pageNo
  81 + * @param pageSize
  82 + * @param req
82 83 * @return
83 84 */
84 85 // @AutoLog(value = "库存表-分页列表查询")
85 86 @ApiOperation(value = "库存表-分页列表查询", notes = "库存表-分页列表查询")
86 87 @GetMapping(value = "/list")
87 88 public Result<IPage<InventoryHeader>> queryPageList(InventoryHeader inventoryHeader, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
88   - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
  89 + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
89 90 HuahengJwtUtil.setWarehouseCode(req, inventoryHeader);
90 91 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
91 92 String realName = HuahengJwtUtil.getCurrentOperator();
... ... @@ -125,7 +126,8 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
125 126  
126 127 /**
127 128 * 添加
128   - * @param inventoryHeader
  129 + *
  130 + * @param inventoryHeader
129 131 * @return
130 132 */
131 133 @AutoLog(value = "库存表-添加")
... ... @@ -139,7 +141,8 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
139 141  
140 142 /**
141 143 * 编辑
142   - * @param inventoryHeader
  144 + *
  145 + * @param inventoryHeader
143 146 * @return
144 147 */
145 148 @AutoLog(value = "库存表-编辑")
... ... @@ -152,7 +155,8 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
152 155  
153 156 /**
154 157 * 通过id删除
155   - * @param id
  158 + *
  159 + * @param id
156 160 * @return
157 161 */
158 162 @AutoLog(value = "库存表-通过id删除")
... ... @@ -165,7 +169,8 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
165 169  
166 170 /**
167 171 * 批量删除
168   - * @param ids
  172 + *
  173 + * @param ids
169 174 * @return
170 175 */
171 176 @AutoLog(value = "库存表-批量删除")
... ... @@ -178,6 +183,7 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
178 183  
179 184 /**
180 185 * 导出
  186 + *
181 187 * @return
182 188 */
183 189 @RequiresPermissions("inventoryHeader:export")
... ... @@ -188,6 +194,7 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
188 194  
189 195 /**
190 196 * 导入
  197 + *
191 198 * @return
192 199 */
193 200 @RequiresPermissions("inventoryHeader:import")
... ... @@ -198,27 +205,30 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
198 205 /*---------------------------------主表处理-end-------------------------------------*/
199 206  
200 207 /*--------------------------------子表处理-库存详情-begin----------------------------------------------*/
  208 +
201 209 /**
202 210 * 通过主表ID查询
  211 + *
203 212 * @return
204 213 */
205 214 // @AutoLog(value = "库存详情-通过主表ID查询")
206 215 @ApiOperation(value = "库存详情-通过主表ID查询", notes = "库存详情-通过主表ID查询")
207 216 @GetMapping(value = "/listInventoryDetailByMainId")
208 217 public Result<IPage<InventoryDetail>> listInventoryDetailByMainId(InventoryDetail inventoryDetail,
209   - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
210   - HttpServletRequest request) {
  218 + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
  219 + HttpServletRequest request) {
211 220 HuahengJwtUtil.setWarehouseCode(request, inventoryDetail);
212 221 QueryWrapper<InventoryDetail> queryWrapper = QueryGenerator.initQueryWrapper(inventoryDetail, request.getParameterMap());
213 222 Page<InventoryDetail> page = new Page<InventoryDetail>(pageNo, pageSize);
214   - IPage<InventoryDetail> pageList = inventoryDetailService.page(page, queryWrapper);
  223 + IPage<InventoryDetail> pageList = inventoryDetailService.queryPage(page, queryWrapper);
215 224 inventoryDetailService.calculateInventoryAge(pageList.getRecords());// 计算库龄
216 225 return Result.OK(pageList);
217 226 }
218 227  
219 228 /**
220 229 * 添加
221   - * @param inventoryDetail
  230 + *
  231 + * @param inventoryDetail
222 232 * @return
223 233 */
224 234 @AutoLog(value = "库存详情-添加")
... ... @@ -232,7 +242,8 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
232 242  
233 243 /**
234 244 * 编辑
235   - * @param inventoryDetail
  245 + *
  246 + * @param inventoryDetail
236 247 * @return
237 248 */
238 249 @AutoLog(value = "库存详情-编辑")
... ... @@ -245,7 +256,8 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
245 256  
246 257 /**
247 258 * 通过id删除
248   - * @param id
  259 + *
  260 + * @param id
249 261 * @return
250 262 */
251 263 @AutoLog(value = "库存详情-通过id删除")
... ... @@ -258,7 +270,8 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
258 270  
259 271 /**
260 272 * 批量删除
261   - * @param ids
  273 + *
  274 + * @param ids
262 275 * @return
263 276 */
264 277 @AutoLog(value = "库存详情-批量删除")
... ... @@ -271,6 +284,7 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
271 284  
272 285 /**
273 286 * 导出
  287 + *
274 288 * @return
275 289 */
276 290 @RequestMapping(value = "/exportInventoryDetail")
... ... @@ -278,7 +292,7 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
278 292 public ModelAndView exportInventoryDetail(HttpServletRequest request, InventoryDetail inventoryDetail) {
279 293 // Step.1 组装查询条件
280 294 QueryWrapper<InventoryDetail> queryWrapper = QueryGenerator.initQueryWrapper(inventoryDetail, request.getParameterMap());
281   - LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
  295 + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
282 296 // Step.2 获取导出数据
283 297 List<InventoryDetail> pageList = inventoryDetailService.list(queryWrapper);
284 298 List<InventoryDetail> exportList = null;
... ... @@ -302,17 +316,18 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
302 316  
303 317 /**
304 318 * 非锁定列表查询
305   - * @param inventoryHeader
306   - * @param pageNo
307   - * @param pageSize
308   - * @param req
  319 + *
  320 + * @param inventoryHeader
  321 + * @param pageNo
  322 + * @param pageSize
  323 + * @param req
309 324 * @return
310 325 */
311 326 // @AutoLog(value = "库存表-分页列表查询")
312 327 @ApiOperation(value = "库存表-非锁定列表查询", notes = "库存表-非锁定列表查询")
313 328 @GetMapping(value = "/freeList")
314 329 public Result<IPage<InventoryHeader>> freeList(InventoryHeader inventoryHeader, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
315   - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
  330 + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
316 331 QueryWrapper<InventoryHeader> queryWrapper = QueryGenerator.initQueryWrapper(inventoryHeader, req.getParameterMap());
317 332 queryWrapper.eq("container_status", QuantityConstant.STATUS_CONTAINER_EMPTY);
318 333 Page<InventoryHeader> page = new Page<InventoryHeader>(pageNo, pageSize);
... ... @@ -322,12 +337,13 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
322 337  
323 338 /**
324 339 * 导入
  340 + *
325 341 * @return
326 342 */
327 343 @RequestMapping(value = "/importInventoryDetail/{mainId}")
328 344 @RequiresPermissions("inventoryDetail:import")
329 345 public Result<?> importInventoryDetail(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") Integer mainId) {
330   - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest)request;
  346 + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
331 347 Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
332 348 for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
333 349 MultipartFile file = entity.getValue();// 获取上传文件对象
... ...