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

mahuandong
2 parents c53066fc 66f0bc51
Showing 11 changed files with 34 additions and 35 deletions
src/main/java/com/huaheng/pc/config/configValue/controller/ConfigValueController.java
src/main/java/com/huaheng/pc/config/cycleCountPreference/controller/cycleCountPreferenceController.java
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java
src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java
src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
src/main/java/com/huaheng/pc/task/taskDetail/service/TaskDetailServiceImpl.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
src/main/resources/templates/check/checkHeader/checkHeader.html
src/main/resources/templates/inventory/inventoryHeader/emptyCheckOut.html
src/main/resources/templates/inventory/inventoryHeader/emptyIn.html
src/main/resources/templates/inventory/inventoryHeader/emptyOut.html
@@ -107,6 +107,9 @@ public class ConfigValueController extends BaseController {
             cycleCountPreferenceTemp.setWarehouseCode(configValue.getWarehouseCode());
             LambdaQueryWrapper<CycleCountPreference> preferenceLambdaQueryWrapper = Wrappers.lambdaQuery(cycleCountPreferenceTemp);
             CycleCountPreference cycleCountPreference = cycleCountPreferenceService.getOne(preferenceLambdaQueryWrapper);
+            if(cycleCountPreference == null){
+                return AjaxResult.error("盘点首选项编码错误，没有该条首选项!");
+            }
             if(cycleCountPreference.getEnable() == false){
                 return AjaxResult.error("不能添加已停用的盘点首选项!");
             }
@@ -161,6 +161,18 @@ public class cycleCountPreferenceController extends BaseController {
         }
         List<Integer> list = new ArrayList<>();
         for (Integer id : Convert.toIntArray(ids)) {
+            //校验该首选项是否在使用
+            CycleCountPreference cycleCountPreference = cycleCountPreferenceService.getById(id);
+                ConfigValue configValueTemp = new ConfigValue();
+                configValueTemp.setModuleType("cyclecount");
+                configValueTemp.setWarehouseCode(cycleCountPreference.getWarehouseCode());
+                LambdaQueryWrapper<ConfigValue> configValueLambdaQueryWrapper = Wrappers.lambdaQuery(configValueTemp);
+                ConfigValue configValue = configValueService.getOne(configValueLambdaQueryWrapper);
+                if(configValue != null){
+                    if(configValue.getIdentifier().equals(cycleCountPreference.getCode())){
+                        return AjaxResult.error("该盘点首选项为系统配置默认选项，请删除系统配置中的选项再删除，删除失败！");
+                    }
+                }
             list.add(id);
         }
         return toAjax(cycleCountPreferenceService.removeByIds(list));
@@ -480,8 +480,7 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
     @Override
     public List<CycleCountDetail> preferenceRealize(List<CycleCountDetail> cycleCoutDetailList) {
         List<CycleCountDetail> cycs = new ArrayList<>();
-        /*
-        根据当前明细条目的盘点首选Code,取出显示要求，再根据显示要求隐藏或显示字段*/
+        /*根据当前明细条目的盘点首选Code,取出显示要求，再根据显示要求隐藏或显示字段*/
         /*//配置表
         ConfigValue configValue = new ConfigValue();
@@ -518,6 +517,7 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
                 item.setMaterialCode("");
                 item.setMaterialName("");
                 item.setMaterialUnit("");
+                item.setMaterialSpec("");
             }
             if(cycleCountPreference.getPromptQuantity() == false){
                 //系统数量
@@ -64,10 +64,9 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl&lt;CycleCountHeaderMap
         temp.setCompanyCode(cyclecountHeader.getCompanyCode());
         LambdaQueryWrapper<CycleCountDetail> lam = Wrappers.lambdaQuery(temp);
         List<CycleCountDetail> list = cycleCountDetailService.list(lam);
-
         //当有子单的状态为100时触发主单的完成状态
         //100状态只有全部完成才写入主单
-        long count100 = list.stream().filter(t->t.getEnableStatus() == 100).count();
+        long count100 = list.stream().filter(t->t.getEnableStatus() == 100).count(); //明细已完成的条数
         if(count100 == list.size() ){
             cyclecountHeader.setStatusCyc(100);
             this.saveOrUpdate(cyclecountHeader);
@@ -87,25 +86,6 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl&lt;CycleCountHeaderMap
             }
         }
-       /* if( count ==0){
-            //说明子单据都还没有开始盘点
-            cyclecountHeader.setStatus(0);
-        }else */
-       /* if(count == list.size()){
-            //说明盘点完成
-            long count2 = list.stream().filter(t->t.getGapQty().compareTo(BigDecimal.ZERO) != 0).count();
-            if(count2 > 0){
-                //说明有差异
-                cyclecountHeader.setStatusCyc(30);
-            }else{
-                //说明无差异
-                cyclecountHeader.setStatusCyc(40);
-            }
-        }else{
-            //说明盘点中
-            cyclecountHeader.setStatusCyc(20);
-        }*/
-       // this.saveOrUpdate(cyclecountHeader);
     }
     /**
@@ -150,8 +130,8 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl&lt;CycleCountHeaderMap
         CycleCountDetail temp = new CycleCountDetail();
         temp.setWarehouseCode(ShiroUtils.getWarehouseCode());
         temp.setCycleCountHeadCode(cyclecountHeader.getCode());
-        LambdaQueryWrapper lm = Wrappers.lambdaQuery(temp);
-        cycleCountDetailService.remove(lm);
+        LambdaQueryWrapper<CycleCountDetail> cycleCountDetailLambdaQueryWrapper= Wrappers.lambdaQuery(temp);
+        cycleCountDetailService.remove(cycleCountDetailLambdaQueryWrapper);
         cycleCountHeaderMapper.deleteById(id);
         return AjaxResult.success("盘点主单和明细删除成功");
@@ -210,8 +210,8 @@ public class InventoryHeaderController extends BaseController
     @ResponseBody
     public TableDataInfo listEmptyContainer(String containerCode, String locationCode)
     {
-        containerCode = containerCode==null?"":containerCode.trim();
-        locationCode = locationCode==null?"":locationCode.trim();
+        containerCode = containerCode == null?"":containerCode.trim();
+        locationCode = locationCode == null?"":locationCode.trim();
         startPage();
         List<Location> list = containerService.getEmptyContainerInLocation(containerCode,locationCode,ShiroUtils.getWarehouseCode());
         return getDataTable(list);
@@ -78,6 +78,7 @@ public class TaskDetailServiceImpl extends ServiceImpl&lt;TaskDetailMapper, TaskDet
                 item.setMaterialCode("");
                 item.setMaterialName("");
                 item.setMaterialUnit("");
+                item.setMaterialSpec("");
             }
             if(cycleCountPreference.getPromptQuantity() == false){
                 //系统数量
@@ -106,6 +106,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     private TaskAssignService taskAssignService;
+
+
+
     /**
      * 盘点任务首选项
      * @param taskHeaderList
@@ -114,7 +117,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     @Transactional
     @Override
     public List<TaskHeader> preferenceRealize(List<TaskHeader> taskHeaderList) {
-        //任务头，默认不显示库位，容器。
+        //盘点任务头，默认不显示库位，容器。
         List<TaskHeader> taskHeaders = new ArrayList<>();
         for(TaskHeader item:taskHeaderList){
             item.setFromLocation("");
@@ -43,12 +43,12 @@
                             </div>
                         </form>
                     </div>
-                    <div class="btn-group hidden-xs" id="toolbar" role="group">
+                    <!--<div class="btn-group hidden-xs" id="toolbar" role="group">
                         <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()"
                            shiro:hasPermission="receipt:receiptHeader:remove">
                             <i class="fa fa-trash-o"></i> 删除
                         </a>
-                    </div>
+                    </div>-->
                     <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
                 </div>
@@ -12,14 +12,14 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">源库位编码：</label>
+            <label class="col-sm-3 control-label">库位编码：</label>
             <div class="col-sm-8">
                 <input id="location" name="location" class="form-control" type="text">
             </div>
         </div>
         <div class="form-group">
             <div class="form-control-static col-sm-offset-9">
-                <input type="button" class="btn-success btn" onclick="selectEmptyInOut()" value="选取" />
+               <!-- <input type="button" class="btn-success btn" onclick="selectEmptyInOut()" value="选取" />-->
                 <button type="submit" class="btn btn-primary">提交</button>
                 <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
             </div>
@@ -6,7 +6,7 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form class="form-horizontal m" id="form-task-emptyIn">
         <div class="form-group">
-            <label class="col-sm-3 control-label">容器编号：</label>
+            <label class="col-sm-3 control-label">容器编码：</label>
             <div class="col-sm-8">
                 <input id="containerCode" name="containerCode" class="form-control" type="text" >
             </div>
@@ -6,7 +6,7 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form class="form-horizontal m" id="form-task-emptyOut">
         <div class="form-group">
-            <label class="col-sm-3 control-label">容器编号：</label>
+            <label class="col-sm-3 control-label">容器编码：</label>
             <div class="col-sm-8">
                 <input id="containerCode" name="containerCode" class="form-control" type="text">
             </div>
@@ -19,7 +19,7 @@
         </div>
         <div class="form-group">
             <div class="form-control-static col-sm-offset-9">
-                <input type="button" class="btn-success btn" onclick="selectEmptyOut()" value="选取" />
+                <!--<input type="button" class="btn-success btn" onclick="selectEmptyOut()" value="选取" />-->
                 <button type="submit" class="btn btn-primary">提交</button>
                 <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
             </div>