diff --git a/src/main/java/com/huaheng/pc/config/configValue/controller/ConfigValueController.java b/src/main/java/com/huaheng/pc/config/configValue/controller/ConfigValueController.java
index 153a6ec..7d64aff 100644
--- a/src/main/java/com/huaheng/pc/config/configValue/controller/ConfigValueController.java
+++ b/src/main/java/com/huaheng/pc/config/configValue/controller/ConfigValueController.java
@@ -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("不能添加已停用的盘点首选项!");
}
diff --git a/src/main/java/com/huaheng/pc/config/cycleCountPreference/controller/cycleCountPreferenceController.java b/src/main/java/com/huaheng/pc/config/cycleCountPreference/controller/cycleCountPreferenceController.java
index 8637304..8c4d5a1 100644
--- a/src/main/java/com/huaheng/pc/config/cycleCountPreference/controller/cycleCountPreferenceController.java
+++ b/src/main/java/com/huaheng/pc/config/cycleCountPreference/controller/cycleCountPreferenceController.java
@@ -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));
diff --git a/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java b/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java
index e07416a..ca767fc 100644
--- a/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java
@@ -480,8 +480,7 @@ public class CycleCountDetailServiceImpl extends ServiceImpl<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<CycleCountDetailMap
item.setMaterialCode("");
item.setMaterialName("");
item.setMaterialUnit("");
+ item.setMaterialSpec("");
}
if(cycleCountPreference.getPromptQuantity() == false){
//系统数量
diff --git a/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java
index 2de1460..60dee9f 100644
--- a/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java
@@ -64,10 +64,9 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl<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<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<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("盘点主单和明细删除成功");
diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java b/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
index d05234a..2f1052f 100644
--- a/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
+++ b/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
@@ -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);
diff --git a/src/main/java/com/huaheng/pc/task/taskDetail/service/TaskDetailServiceImpl.java b/src/main/java/com/huaheng/pc/task/taskDetail/service/TaskDetailServiceImpl.java
index 710916b..d781459 100644
--- a/src/main/java/com/huaheng/pc/task/taskDetail/service/TaskDetailServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/task/taskDetail/service/TaskDetailServiceImpl.java
@@ -78,6 +78,7 @@ public class TaskDetailServiceImpl extends ServiceImpl<TaskDetailMapper, TaskDet
item.setMaterialCode("");
item.setMaterialName("");
item.setMaterialUnit("");
+ item.setMaterialSpec("");
}
if(cycleCountPreference.getPromptQuantity() == false){
//系统数量
diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
index d62aa4f..e7bd2cf 100644
--- a/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
@@ -106,6 +106,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
private TaskAssignService taskAssignService;
+
+
+
/**
* 盘点任务首选项
* @param taskHeaderList
@@ -114,7 +117,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
@Transactional
@Override
public List<TaskHeader> preferenceRealize(List<TaskHeader> taskHeaderList) {
- //任务头，默认不显示库位，容器。
+ //盘点任务头，默认不显示库位，容器。
List<TaskHeader> taskHeaders = new ArrayList<>();
for(TaskHeader item:taskHeaderList){
item.setFromLocation("");
diff --git a/src/main/resources/templates/check/checkHeader/checkHeader.html b/src/main/resources/templates/check/checkHeader/checkHeader.html
index 7145254..dcf6346 100644
--- a/src/main/resources/templates/check/checkHeader/checkHeader.html
+++ b/src/main/resources/templates/check/checkHeader/checkHeader.html
@@ -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>
diff --git a/src/main/resources/templates/inventory/inventoryHeader/emptyCheckOut.html b/src/main/resources/templates/inventory/inventoryHeader/emptyCheckOut.html
index 0c4e394..b6c3d1a 100644
--- a/src/main/resources/templates/inventory/inventoryHeader/emptyCheckOut.html
+++ b/src/main/resources/templates/inventory/inventoryHeader/emptyCheckOut.html
@@ -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>
diff --git a/src/main/resources/templates/inventory/inventoryHeader/emptyIn.html b/src/main/resources/templates/inventory/inventoryHeader/emptyIn.html
index e072a78..093306d 100644
--- a/src/main/resources/templates/inventory/inventoryHeader/emptyIn.html
+++ b/src/main/resources/templates/inventory/inventoryHeader/emptyIn.html
@@ -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>
diff --git a/src/main/resources/templates/inventory/inventoryHeader/emptyOut.html b/src/main/resources/templates/inventory/inventoryHeader/emptyOut.html
index 4709a13..f82a17c 100644
--- a/src/main/resources/templates/inventory/inventoryHeader/emptyOut.html
+++ b/src/main/resources/templates/inventory/inventoryHeader/emptyOut.html
@@ -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>