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

xqs
2 parents d2e6ada5 55fa67dd
Showing 5 changed files with 53 additions and 27 deletions
src/main/java/com/huaheng/mobile/download/ApkController.java
src/main/java/com/huaheng/mobile/general/MobileUserController.java
src/main/java/com/huaheng/mobile/invenory/MobileInventoryController.java
src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java
src/main/resources/templates/inventory/cyclecountDetail/add.html
@@ -29,6 +29,9 @@ public class ApkController {
         if  (param.get("versionCode") == null)
             throw new JSONException("versionCode不能为空");
         List<ApkInfo>  apkinfos = apkMapper.getApkInfoByPkgName(param.get("pkgName"));
+        if(apkinfos == null || apkinfos.size() <= 0) {
+            return AjaxResult.error("当前已经是最新版本");
+        }
         ApkInfo apkInfo = apkinfos.get(0);
         int maxVersion = Integer.MAX_VALUE;
         String project = param.containsKey("project") ? param.get("project") : null;
@@ -102,10 +102,7 @@ public class MobileUserController extends BaseController {
     @PostMapping("/getCompanyInfo")
     @ApiOperation("获取公司信息")
     public AjaxResult getCompanyInfo() {
-        LambdaQueryWrapper<Company> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(Company::getDeleted, false);
-
-        List<Company> companies = companyService.list(queryWrapper);
+        List<Company> companies = companyService.selectCompanyByCurrentUserId();
         List<CompanyInfo> companyInfos = new ArrayList<>();
         for(Company company : companies) {
             companyInfos.add(new CompanyInfo(company.getId(), company.getCode(), company.getName()));
@@ -157,7 +157,24 @@ public class MobileInventoryController {
         if(location == null) {
             return AjaxResult.error("没有这个库位");
         }
-        return AjaxResult.success("库位存在");
+        return AjaxResult.success("库位存在").setData(code);
+    }
+
+    @PostMapping( "/isContainer")
+    @ApiOperation("判断是不是库位")
+    @ResponseBody
+    public AjaxResult isContainer(@RequestBody @ApiParam(value="任务id") Map<String, String> param) {
+        String code = param.get("code");
+        if (StringUtils.isEmpty(code)) {
+            return AjaxResult.error("location不能为空");
+        }
+        LambdaQueryWrapper<Container> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(Container::getCode, code);
+        Container container = containerService.getOne(queryWrapper);
+        if(container == null) {
+            return AjaxResult.error("没有这个容器");
+        }
+        return AjaxResult.success("容器存在").setData(code);
     }
  
     @PostMapping("/getLocationCode")
@@ -103,22 +103,25 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
         if (StringUtils.isNotEmpty(container.getLocationCode()))  {
             return AjaxResult.error("容器已在库位[" + container.getLocationCode() + "]上");
         }
-        //库位
-        Location temp = new Location();
-        temp.setCode(destinationLocation);
-        temp.setWarehouseCode(ShiroUtils.getWarehouseCode());
-        LambdaQueryWrapper lambda = Wrappers.lambdaQuery(temp);
-        Location loc = locationService.getOne(lambda);
+        Location loc = null;
         if(StringUtils.isNotEmpty(destinationLocation)) {
-            //校验目标地址
-            if (loc == null) {
-                return AjaxResult.error("目标库位不存在");
-            }
-            if (StringUtils.isNotEmpty(loc.getContainerCode())) {
-                return AjaxResult.error("目标库位已存在托盘");
-            }
-            if (!loc.getStatus().equals("empty")) {
-                return AjaxResult.error("目标库位非空闲");
+            //库位
+            Location temp = new Location();
+            temp.setCode(destinationLocation);
+            temp.setWarehouseCode(ShiroUtils.getWarehouseCode());
+            LambdaQueryWrapper lambda = Wrappers.lambdaQuery(temp);
+            loc = locationService.getOne(lambda);
+            if (StringUtils.isNotEmpty(destinationLocation)) {
+                //校验目标地址
+                if (loc == null) {
+                    return AjaxResult.error("目标库位不存在");
+                }
+                if (StringUtils.isNotEmpty(loc.getContainerCode())) {
+                    return AjaxResult.error("目标库位已存在托盘");
+                }
+                if (!loc.getStatus().equals("empty")) {
+                    return AjaxResult.error("目标库位非空闲");
+                }
             }
         }
  
@@ -133,21 +136,25 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
  
         //创建主任务
         TaskHeader taskHeader = new TaskHeader();
-        taskHeader.setWarehouseCode(loc.getWarehouseCode());
+        taskHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
         taskHeader.setCompanyCode(ShiroUtils.getCompanyCodeList().get(0));//货主
         taskHeader.setInternalTaskType(QuantityConstant.TASK_INTENERTYPE_SHELF); //入库内部类型都给100
         taskHeader.setTaskType(QuantityConstant.TASK_TYPE_EMPTYRECEIPT);
         taskHeader.setContainerCode(container.getCode());
         taskHeader.setStatus(QuantityConstant.TASK_STATUS_BUILD);
         taskHeader.setFromLocation("");
-        taskHeader.setToLocation(loc.getCode());
+        if(loc != null) {
+            taskHeader.setToLocation(loc.getCode());
+        }
         taskHeader.setCreated(new Date());
         taskHeader.setCreatedBy(ShiroUtils.getLoginName());
         taskHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
         taskHeader.setLastUpdated(new Date());
         if(taskHeaderService.save(taskHeader)){
             //锁定库位状态
-            locationService.updateStatus(loc.getContainerCode(),"lock");
+            if(loc != null) {
+                locationService.updateStatus(loc.getContainerCode(), "lock");
+            }
         }else{
             throw new ServiceException("空托入库主表生成失败！");
         }
@@ -169,7 +176,9 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
             throw new ServiceException("空托入库任务明细生成失败！");
         }
         //锁库位
-        locationService.updateStatus(loc.getCode(), "lock");
+        if(loc != null) {
+            locationService.updateStatus(loc.getCode(), "lock");
+        }
         return AjaxResult.success(taskHeader.getId());
     }
  
@@ -11,6 +11,9 @@
                 <input type="hidden" id="cycleCountHeadCode" name="cycleCountHeadCode" th:value="${cycleCountHeadCode}">
 					<div class="select-list">
 						<ul>
+                            <li>
+                                货主编码：<input type="text" id="companyCode" name="companyCode" th:value="${companyCode}" readonly="readonly" />
+                            </li>
                                 <li>
                                     库存头ID：<input id="inventoryHeaderId" type="text" name="inventoryHeaderId"/>
                                 </li>
@@ -41,9 +44,6 @@
                                     供应商编码：<input type="text" name="supplierCode"/>
                                 </li>
                                 <li>
-                                    货主编码：<input type="text" name="companyCode"/>
-                                </li>
-                                <li>
                                     上游单号：<input type="text" name="referCode"/>
                                 </li>
                                 <li>