Merge remote-tracking branch 'origin/develop' into develop

xumiao
2 parents 7316705e 657905a7
Showing 5 changed files with 32 additions and 40 deletions
src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java
src/main/java/com/huaheng/pc/receipt/receiptDetailHistory/controller/ReceiptDetailHistoryController.java
src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/controller/ReceiptHeaderHistoryController.java
src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
@@ -538,6 +538,7 @@ public class MobileBatchReceiptController {
  
     @PostMapping("/callBox")
     @ApiOperation("移动端呼叫料盒")
+    @ApiLogger(apiName = "wcs调用wms分配库位", from = "WCS")
     @Log(title = "移动端呼叫料盒", action = BusinessType.OTHER)
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult callBox(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) {
@@ -54,7 +54,7 @@ public class ReceiptDetailHistoryController extends BaseController {
      */
     @ApiOperation(value = "查看入库详情", notes = "根据头表id获取入库单明细信息", httpMethod = "POST")
     @RequiresPermissions("receipt:receiptDetail:list")
-    @Log(title = "入库-入库单明细管理", operating = "查看入库单明细", action = BusinessType.GRANT)
+    //@Log(title = "入库-入库单明细管理", operating = "查看入库单明细", action = BusinessType.GRANT)
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(@ApiParam(name = "receiptDetail", value = "入库详情") ReceiptDetailHistory receiptDetail,
@@ -126,7 +126,7 @@ public class ReceiptHeaderHistoryController extends BaseController {
      */
     @ApiOperation(value = "查询入库单 ", notes = "查询入库单 ", httpMethod = "POST")
     @RequiresPermissions("receipt:receiptDetail:add")
-    @Log(title = "入库-入库单 ", operating = "查询入库单 ", action = BusinessType.OTHER)
+    //@Log(title = "入库-入库单 ", operating = "查询入库单 ", action = BusinessType.OTHER)
     @PostMapping("/getReceiptHeader")
     @ResponseBody
     public AjaxResult<ReceiptHeaderHistory> getReceiptHeader(String id) {
@@ -565,7 +565,7 @@ public class ShipmentHeaderController extends BaseController {
      * 查询波次列表
      */
     @RequiresPermissions("shipment:bill:wave")
-    @Log(title = "出库-出库单", operating = "查询库区列表", action = BusinessType.GRANT)
+    //@Log(title = "出库-出库单", operating = "查询库区列表", action = BusinessType.GRANT)
     @PostMapping("/waveList")
     @ResponseBody
     public TableDataInfo waveList() {
@@ -331,46 +331,37 @@ public class ReceiptTaskService {
             inventoryHeader = inventoryHeaderService.getOne(new LambdaQueryWrapper<InventoryHeader>()
                     .eq(InventoryHeader::getLocationCode, fromLocationCode)
                     .eq(InventoryHeader::getContainerCode, task.getContainerCode()));
-
-            if (inventoryHeader == null) {
-                throw new ServiceException("补充入库，原库位的库存查不到了：" + fromLocationCode + "，请检查库存," + task.getContainerCode());
-            }
-
-            //修改库位状态和对应的容器
-            Location updateLocation = new Location();
-            updateLocation.setContainerCode("");
-            updateLocation.setWarehouseCode(warehouseCode);
-            updateLocation.setStatus(QuantityConstant.STATUS_LOCATION_EMPTY);
-            LambdaUpdateWrapper<Location> locationLambdaUpdateWrapper = Wrappers.lambdaUpdate();
-            locationLambdaUpdateWrapper.eq(Location::getCode, fromLocationCode);
-            locationLambdaUpdateWrapper.eq(Location::getWarehouseCode, warehouseCode);
-            if (!locationService.update(updateLocation, locationLambdaUpdateWrapper)) {
-                throw new ServiceException("补充入库，更新库位失败");
-            }
-
-
-            //解除右侧库位禁用和对应4个库位标记
-            Container container = containerService.getContainerByCode(task.getContainerCode());
-            locationService.unbanRightLocationAndUnmark(container.getContainerType(), fromLocationCode);
-
-            Location toLocation = locationService.getLocationByCode(task.getToLocation());
-            inventoryHeader.setLocationCode(task.getToLocation());
-            if (!inventoryHeaderService.updateById(inventoryHeader)) {
-                throw new ServiceException("补充入库，更新库存头表失败");
-            }
-
-            List<InventoryDetail> inventoryDetails = inventoryDetailService.list(new LambdaQueryWrapper<InventoryDetail>().eq(InventoryDetail::getInventoryHeaderId, inventoryHeader.getId()));
-
-            if (inventoryDetails != null && !inventoryDetails.isEmpty()) {
-                for (InventoryDetail inventoryDetail : inventoryDetails) {
-                    inventoryDetail.setLocationCode(task.getToLocation());
-                    inventoryDetail.setZoneCode(toLocation.getZoneCode());
-                    if (!inventoryDetailService.updateById(inventoryDetail)) {
-                        throw new ServiceException("补充入库，更新库存明细失败");
+            if (inventoryHeader != null) {
+                //修改库位状态和对应的容器
+                Location updateLocation = new Location();
+                updateLocation.setContainerCode("");
+                updateLocation.setWarehouseCode(warehouseCode);
+                updateLocation.setStatus(QuantityConstant.STATUS_LOCATION_EMPTY);
+                LambdaUpdateWrapper<Location> locationLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+                locationLambdaUpdateWrapper.eq(Location::getCode, fromLocationCode);
+                locationLambdaUpdateWrapper.eq(Location::getWarehouseCode, warehouseCode);
+                if (!locationService.update(updateLocation, locationLambdaUpdateWrapper)) {
+                    throw new ServiceException("补充入库，更新库位失败");
+                }
+                //解除右侧库位禁用和对应4个库位标记
+                Container container = containerService.getContainerByCode(task.getContainerCode());
+                locationService.unbanRightLocationAndUnmark(container.getContainerType(), fromLocationCode);
+                Location toLocation = locationService.getLocationByCode(task.getToLocation());
+                inventoryHeader.setLocationCode(task.getToLocation());
+                if (!inventoryHeaderService.updateById(inventoryHeader)) {
+                    throw new ServiceException("补充入库，更新库存头表失败");
+                }
+                List<InventoryDetail> inventoryDetails = inventoryDetailService.list(new LambdaQueryWrapper<InventoryDetail>().eq(InventoryDetail::getInventoryHeaderId, inventoryHeader.getId()));
+                if (inventoryDetails != null && !inventoryDetails.isEmpty()) {
+                    for (InventoryDetail inventoryDetail : inventoryDetails) {
+                        inventoryDetail.setLocationCode(task.getToLocation());
+                        inventoryDetail.setZoneCode(toLocation.getZoneCode());
+                        if (!inventoryDetailService.updateById(inventoryDetail)) {
+                            throw new ServiceException("补充入库，更新库存明细失败");
+                        }
                     }
                 }
             }
-
         }
         if (StringUtils.isNull(inventoryHeader)) {
             LambdaQueryWrapper<InventoryHeader> inventoryHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();