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

mahuandong
2 parents f164a726 4ec1a667
Showing 6 changed files with 20 additions and 13 deletions
src/main/java/com/huaheng/mobile/invenory/MobileInventoryController.java
src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
src/main/resources/templates/inventory/inventoryHeader/emptyIn.html
src/main/resources/templates/task/task/emptyIn.html
@@ -218,7 +218,7 @@ public class MobileInventoryController {
         String containerCode = param.get("containerCode");
         String destinationLocation = param.get("destinationLocation");
         String companyCode = param.get("companyCode");
-        return  taskService.createEmptyIn(containerCode, destinationLocation, companyCode);
+        return  inventoryService.createEmptyIn(containerCode, destinationLocation);
     }
     @PostMapping("/createEmptyOut")
@@ -109,11 +109,11 @@ public class InventoryHeaderController extends BaseController
 	@RequiresPermissions("inventory:inventoryHeader:seeOut")
 	@PostMapping("/createCheckOutTask")
 	@ResponseBody
-	public AjaxResult createCheckOutTask(String[] ids){
+	public AjaxResult createCheckOutTask(String ids){
 		if(StringUtils.isEmpty(ids)){
 			return AjaxResult.error("库存ID不能为空！");
 		}
-		return inventoryHeaderService.createCheckOutTask(ids);
+		return inventoryHeaderService.createCheckOutTask(ids.split(","));
 	}
     /**
@@ -135,7 +135,7 @@ public class InventoryHeaderController extends BaseController
     @Log(title = "任务-任务管理", operating = "生成空托盘入库任务", action = BusinessType.INSERT)
     @ResponseBody
     public AjaxResult emptyIn(String containerCode,String destinationLocation){
-        if(StringUtils.isEmpty(containerCode) || StringUtils.isEmpty(destinationLocation)){
+        if(StringUtils.isEmpty(containerCode)){
             throw new ServiceException("容器和目标库位不能有空值！");
         }
         return inventoryHeaderService.createEmptyIn(containerCode, destinationLocation);
 package com.huaheng.pc.inventory.inventoryHeader.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.huaheng.common.constant.QuantityConstant;
 import com.huaheng.common.exception.service.ServiceException;
@@ -103,6 +104,10 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
         if (StringUtils.isNotEmpty(container.getLocationCode()))  {
             return AjaxResult.error("容器已在库位[" + container.getLocationCode() + "]上");
         }
+        container.setStatus("lock");
+        LambdaUpdateWrapper<Container> containerUpdateWrapper = Wrappers.lambdaUpdate();
+        containerUpdateWrapper.eq(Container::getCode, container.getCode());
+        containerService.update(container, containerUpdateWrapper);
         Location loc = null;
         if(StringUtils.isNotEmpty(destinationLocation)) {
             //库位
@@ -220,7 +225,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
         inventoryDetailLambdaQueryWrapper.eq(InventoryDetail::getWarehouseCode,loc.getWarehouseCode())
                             .eq(InventoryDetail::getLocationCode, loc.getCode());
          List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper);
-        if(inventoryDetailList != null || inventoryDetailList.size() > 0){
+        if(inventoryDetailList != null && inventoryDetailList.size() > 0){
             return AjaxResult.error("该容器上有库存，无法空托出库！");
         }
         //判断托盘是否已经存在任务
@@ -1149,11 +1149,13 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 inventoryTransaction.setSupplierCode(item.getSupplierCode());
                 inventoryTransactionList.add(inventoryTransaction);
             }
-            if (inventoryDetailService.saveOrUpdateBatch(inventoryDetails)) {
-                //更新库存明细成功后，写入库存交易
-                inventoryTransactionService.saveBatch(inventoryTransactionList);
-            } else {
-                throw new ServiceException("库存明细更新错误!");
+            if(inventoryDetails != null && inventoryDetails.size() > 0) {
+                if (inventoryDetailService.saveOrUpdateBatch(inventoryDetails)) {
+                    //更新库存明细成功后，写入库存交易
+                    inventoryTransactionService.saveBatch(inventoryTransactionList);
+                } else {
+                    throw new ServiceException("库存明细更新错误!");
+                }
             }
         }
@@ -34,7 +34,7 @@
                 required:true,
             },
             destinationLocation:{
-                required:true,
+
             },
         },
         submitHandler: function(form) {
@@ -27,14 +27,14 @@
 </div>
 <div th:include="include::footer"></div>
 <script type="text/javascript">
-    var prefix = ctx + "task/task"
+    var prefix = ctx + "inventory/inventoryHeader"
     $("#form-task-emptyIn").validate({
         rules:{
             containerCode:{
                 required:true,
             },
             destinationLocation:{
-                required:true,
+                required:false,
             },
         },
         submitHandler: function(form) {