diff --git a/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java b/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java
index 6b106a3..67acf2e 100644
--- a/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java
+++ b/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java
@@ -17,4 +17,7 @@ public interface ContainerService extends IService<Container>{
void updateLocationCodeAndStatus(String containerCode, String locationCode, String status);
+ void removeContainer(String containType, String containCode);
+
+ void removeByCode(String containCode);
}
diff --git a/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java b/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java
index 09c1ec2..4db7b0e 100644
--- a/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java
@@ -18,6 +18,7 @@ import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.huaheng.pc.config.container.domain.Container;
import com.huaheng.pc.config.container.mapper.ContainerMapper;
+import org.springframework.transaction.annotation.Transactional;
@Service
public class ContainerServiceImpl extends ServiceImpl<ContainerMapper, Container> implements ContainerService{
@@ -127,5 +128,38 @@ public class ContainerServiceImpl extends ServiceImpl<ContainerMapper, Container
containerMapper.updateLocationCodeAndStatus(ShiroUtils.getWarehouseCode(), containerCode, locationCode, status);
}
+ /**
+ * 如果为临时容器，在取消组盘和出库任务完成时删除容器
+ * @param containerType 容器类型
+ * @param containerCode 容器编码
+ * @return
+ */
+ @Transactional
+ public void removeContainer(String containerType, String containerCode) {
+ if ("LS".equals(containerType)) {
+ LambdaQueryWrapper<Container> lambdaQueryWrapper = Wrappers.lambdaQuery();
+ lambdaQueryWrapper.eq(Container::getCode,containerCode);
+ if (!this.remove(lambdaQueryWrapper)){
+ throw new ServiceException("删除临时容器失败");
+ }
+ }
+ }
+
+ /**
+ * 如果为临时容器出库任务完成时删除容器
+ * @param containCode
+ */
+ @Override
+ @Transactional
+ public void removeByCode(String containCode) {
+ LambdaQueryWrapper<Container> lambdaQueryWrapper = Wrappers.lambdaQuery();
+ lambdaQueryWrapper.eq(Container::getCode, containCode);
+ Container container = this.getOne(lambdaQueryWrapper);
+ if ("LS".equals(container.getContainerType())) {
+ if (!this.removeById(container.getId())){
+ throw new ServiceException("删除临时容器失败");
+ }
+ }
+ }
}
diff --git a/src/main/java/com/huaheng/pc/config/waveMaster/controller/WaveMasterController.java b/src/main/java/com/huaheng/pc/config/waveMaster/controller/WaveMasterController.java
index 34ba0b0..4230767 100644
--- a/src/main/java/com/huaheng/pc/config/waveMaster/controller/WaveMasterController.java
+++ b/src/main/java/com/huaheng/pc/config/waveMaster/controller/WaveMasterController.java
@@ -146,7 +146,4 @@ public class WaveMasterController extends BaseController {
}
return toAjax(waveMasterService.removeByIds(list));
}
-
-
-
}
diff --git a/src/main/java/com/huaheng/pc/inventory/adjustDetail/controller/adjustDetailController.java b/src/main/java/com/huaheng/pc/inventory/adjustDetail/controller/adjustDetailController.java
index 6874187..1651e75 100644
--- a/src/main/java/com/huaheng/pc/inventory/adjustDetail/controller/adjustDetailController.java
+++ b/src/main/java/com/huaheng/pc/inventory/adjustDetail/controller/adjustDetailController.java
@@ -16,7 +16,9 @@ import com.huaheng.framework.web.page.TableDataInfo;
import com.huaheng.framework.web.page.TableSupport;
import com.huaheng.pc.inventory.adjustDetail.domain.AdjustDetail;
import com.huaheng.pc.inventory.adjustDetail.service.AdjustDetailService;
+import com.huaheng.pc.inventory.adjustHeader.domain.AdjustHeader;
import com.huaheng.pc.inventory.adjustHeader.service.AdjustHeaderService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
@@ -117,11 +119,59 @@ public class adjustDetailController extends BaseController {
for (Integer id : integers)
{
AdjustDetail adjustDetailEdit = adjustDetailService.getById(id);
+ //单据先审批
+ if(StringUtils.isEmpty(adjustDetailEdit.getAgreeBy()) || adjustDetailEdit.getStatus() < 1 ){
+ return AjaxResult.error("单据未审批不允许调整");
+ }
adjustDetailService.updateAdjustDetail(adjustDetailEdit);
}
return AjaxResult.success("调整下发成功！");
}
+ /**
+ * 调整审批
+ * @param ids
+ * @return
+ */
+ @Log(title = "库存-调整单", operating = "调整审批", action = BusinessType.OTHER)
+ @PostMapping("/adjustAgree")
+ @ResponseBody
+ public AjaxResult adjustAgree (String ids){
+
+ if(ids == null){
+ throw new SecurityException("ID不能为空！");
+ }
+ Integer[] integers = Convert.toIntArray(ids);
+ for (Integer id : integers){
+ AdjustDetail adjustDetailEdit = adjustDetailService.getById(id);
+ adjustDetailService.adjustAgree(adjustDetailEdit);
+
+ }
+ return AjaxResult.success("审批已下发！");
+ }
+
+ /**
+ * 删除调整单明细
+ */
+ //@RequiresPermissions("inventory:cyclecountDetail:remove")
+ @Log(title = "库存-调整", operating = "删除调整单明细", action = BusinessType.DELETE)
+ @PostMapping( "/remove")
+ @ResponseBody
+ public AjaxResult remove(Integer id){
+ if(id == null){
+ return AjaxResult.error("ID不能为空！");
+ }
+ AdjustDetail adjustDetail = adjustDetailService.getById(id);
+ if(adjustDetail.getStatus() > 0 ){
+ return AjaxResult.error("单据状态不允许删除");
+ }
+ adjustDetailService.removeById(id);
+
+ return AjaxResult.success("删除成功！");
+ }
+
+
+
diff --git a/src/main/java/com/huaheng/pc/inventory/adjustDetail/service/AdjustDetailService.java b/src/main/java/com/huaheng/pc/inventory/adjustDetail/service/AdjustDetailService.java
index c342752..0d78463 100644
--- a/src/main/java/com/huaheng/pc/inventory/adjustDetail/service/AdjustDetailService.java
+++ b/src/main/java/com/huaheng/pc/inventory/adjustDetail/service/AdjustDetailService.java
@@ -10,6 +10,8 @@ public interface AdjustDetailService extends IService<AdjustDetail> {
AjaxResult updateAdjustDetail(AdjustDetail adjustDetail);
+ AjaxResult adjustAgree(AdjustDetail adjustDetail);
+
}
diff --git a/src/main/java/com/huaheng/pc/inventory/adjustDetail/service/AdjustDetailServiceImpl.java b/src/main/java/com/huaheng/pc/inventory/adjustDetail/service/AdjustDetailServiceImpl.java
index e99c191..96a387d 100644
--- a/src/main/java/com/huaheng/pc/inventory/adjustDetail/service/AdjustDetailServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/inventory/adjustDetail/service/AdjustDetailServiceImpl.java
@@ -39,10 +39,6 @@ public class AdjustDetailServiceImpl extends ServiceImpl<AdjustDetailMapper, Adj
@Resource
private AdjustHeaderService adjustHeaderService;
@Resource
- private CycleCountHeaderService cycleCountHeaderService;
- @Resource
- private CycleCountDetailService cycleCountDetailService;
- @Resource
private InventoryHeaderService inventoryHeaderService;
@Resource
private InventoryDetailService inventoryDetailService;
@@ -59,6 +55,30 @@ public class AdjustDetailServiceImpl extends ServiceImpl<AdjustDetailMapper, Adj
+
+ /**
+ * 调整审批
+ * @param adjustDetail
+ * @return
+ */
+ @Transactional
+ @Override
+ public AjaxResult adjustAgree(AdjustDetail adjustDetail) {
+ //修改状态，审批人栏填入名称，修改状态
+ if(adjustDetail.getStatus() > 1){
+ return AjaxResult.error("单据状态无法审批！");
+ }
+ adjustDetail.setAgreeBy(ShiroUtils.getLoginName());
+ adjustDetail.setAgreeTime(new Date());
+ adjustDetail.setStatus(1);
+ adjustDetail.setLastUpdated(new Date());
+ adjustDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
+ this.saveOrUpdate(adjustDetail);
+
+ return AjaxResult.success("审批完成!");
+ }
+
+
/**
* 调整库存
* 调整数量，调整库存状态
@@ -89,7 +109,7 @@ public class AdjustDetailServiceImpl extends ServiceImpl<AdjustDetailMapper, Adj
LambdaQueryWrapper<Location> lambdaQueryWrapper = Wrappers.lambdaQuery(location);
location = locationService.getOne(lambdaQueryWrapper);
if (!location.getStatus().equals("empty")) {
- throw new SecurityException(inventoryDetail.getId() + "库存非空闲，请等待任务完成再进行调整！");
+ throw new SecurityException(inventoryDetail.getId() + "库存非空闲，请等待其他任务完成再进行调整！");
}
//判断调整哪一个属性值
@@ -123,6 +143,7 @@ public class AdjustDetailServiceImpl extends ServiceImpl<AdjustDetailMapper, Adj
return AjaxResult.success("调整库存成功！");
}
+
/**
* 调整修改库存数量
* @param adjustDetail
diff --git a/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java b/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java
index 865cf34..cb634bb 100644
--- a/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java
+++ b/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java
@@ -174,14 +174,14 @@ public class CycleCountDetailController extends BaseController {
if(cyclecountHeader == null){
return AjaxResult.error("主单据不存在");
}
- if(cyclecountHeader.getStatusCyc() > 5){
+ if(cyclecountHeader.getStatusCyc() > 1){
return AjaxResult.error("主单据状态不允许删除");
}
for (Integer id : detailsIds)
{
//只允许删除新建状态下的盘点明细。
CycleCountDetail cyclecountDetails = cycleCountDetailService.getById(id);
- if(cyclecountDetails.getEnableStatus() > 5){
+ if(cyclecountDetails.getEnableStatus() > 1){
return AjaxResult.error("盘点已开始执行，不允许删除该盘点明细！");
}
cycleCountDetailService.removeById(id);
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
index 69aa26d..a88329a 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
@@ -14,6 +14,7 @@ import com.huaheng.pc.config.location.domain.Location;
import com.huaheng.pc.config.location.service.LocationService;
import com.huaheng.pc.config.material.domain.Material;
import com.huaheng.pc.config.material.service.MaterialService;
+import com.huaheng.pc.config.warehouse.domain.Warehouse;
import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService;
import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHeader;
@@ -142,6 +143,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
* @return
*/
@Override
+ @Transactional
public Boolean cancelByIds(List<Integer> ids) {
for (Integer id : ids) {
//如果已生成任务则不允许取消组盘
@@ -160,6 +162,10 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
containerDetailLambda = Wrappers.lambdaQuery();
containerDetailLambda.eq(ReceiptContainerDetail::getReceiptId, receiptContainerDetail.getReceiptId());
List<ReceiptContainerDetail> containerDetailList = receiptContainerDetailService.list(containerDetailLambda);
+
+ //如果是临时容器，取消组盘时删除容器表
+ containerService.removeContainer(receiptContainerDetail.getContainerType(), receiptContainerDetail.getContainerCode());
+
//如果入库组盘没有该入库单的组盘信息，回滚入库单状态
if (containerDetailList == null){
ReceiptHeader receiptHeader = new ReceiptHeader();
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 51aaf6a..71b50a9 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
@@ -1174,6 +1174,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
* 完成出库任务
* */
@Override
+ @Transactional
public void completeShipmentTask(TaskHeader task) {
//获取所有子任务
TaskDetail condition = new TaskDetail();
@@ -1246,6 +1247,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
task.setLastUpdatedBy(ShiroUtils.getLoginName());
task.setLastUpdated(new Date());
taskHeaderService.updateById(task);
+
+ //如果是临时容器出库完成后删除容器
+ containerService.removeByCode(task.getContainerCode());
+
//将库位状态改为空闲，如果是整出的对应的容器也清空
Location locationRecord = new Location();
locationRecord.setStatus("empty");
diff --git a/src/main/resources/templates/config/waveMaster/waveMaster.html b/src/main/resources/templates/config/waveMaster/waveMaster.html
index fdd2b32..496759c 100644
--- a/src/main/resources/templates/config/waveMaster/waveMaster.html
+++ b/src/main/resources/templates/config/waveMaster/waveMaster.html
@@ -48,10 +48,10 @@
</div>
<div class="btn-group hidden-xs" id="toolbar" role="group">
- <a class="btn btn-outline btn-success btn-rounded" onclick="matserAdd()" shiro:hasPermission="config:waveMaster:add">
+ <a class="btn btn-outline btn-success btn-rounded" onclick="masterAdd()" shiro:hasPermission="config:waveMaster:add">
<i class="fa fa-plus"></i> 新增
</a>
- <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:waveMaster:remove">
+ <a class="btn btn-outline btn-danger btn-rounded" onclick="masterBatRemove()" shiro:hasPermission="config:waveMaster:remove">
<i class="fa fa-trash-o"></i> 删除
</a>
</div>
@@ -87,11 +87,11 @@
</form>
</div>
<div class="btn-group hidden-xs" id="toolbar1" role="group">
- <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()"
+ <a class="btn btn-outline btn-success btn-rounded" onclick="headerAdd()"
shiro:hasPermission="config:waveFlowHeader:add">
<i class="fa fa-plus"></i> 新增
</a>
- <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()"
+ <a class="btn btn-outline btn-danger btn-rounded" onclick="headerBatRemove()"
shiro:hasPermission="config:waveFlowHeader:remove">
<i class="fa fa-trash-o"></i> 删除
</a>
@@ -102,6 +102,18 @@
</div>
<div class="tab-pane fade" id="tabDetail">
+
+ <div class="btn-group hidden-xs" id="toolbar2" role="group">
+ <a class="btn btn-outline btn-success btn-rounded" onclick="detailAdd()"
+ shiro:hasPermission="config:waveFlowHeader:add">
+ <i class="fa fa-plus"></i> 新增
+ </a>
+ <a class="btn btn-outline btn-danger btn-rounded" onclick="detailBatRemove()"
+ shiro:hasPermission="config:waveFlowHeader:remove">
+ <i class="fa fa-trash-o"></i> 删除
+ </a>
+ </div>
+
<table id="bootstrap-table2" data-mobile-responsive="true"
class="table table-bordered table-hover"></table>
</div>
@@ -261,8 +273,8 @@
align: 'center',
formatter: function(value, row, index) {
var actions = [];
- actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>编辑</a> ');
- actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>');
+ actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="masterEdit(\''+row.id+'\')" ><i class="fa fa-edit"></i>编辑</a> ');
+ actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="masterDel(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>');
return actions.join('');
}
}],
@@ -342,8 +354,8 @@
align: 'center',
formatter: function(value, row, index) {
var actions = [];
- actions.push('<a class="btn btn-success btn-xs ' + editFlag1 + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
- actions.push('<a class="btn btn-danger btn-xs ' + removeFlag1 + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
+ actions.push('<a class="btn btn-success btn-xs ' + editFlag1 + '" href="#" onclick="headerEdit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+ actions.push('<a class="btn btn-danger btn-xs ' + removeFlag1 + '" href="#" onclick="headerRemove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
return actions.join('');
}
}],
@@ -374,6 +386,7 @@
search: false,
sortName: "id",
sortOrder: "desc",
+ toolbar: "#toolbar2",
columns: [{
checkbox: true
},
@@ -453,8 +466,8 @@
align: 'center',
formatter: function(value, row, index) {
var actions = [];
- actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
- actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
+ actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="detailEdit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+ actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="detailRemove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
return actions.join('');
}
}]
@@ -463,6 +476,7 @@
function header() {
$("#myTab li").removeClass("active");
$("#tabMaster").removeClass("in active");
+ $("#tabDetail").removeClass("in active");
$("#myTab li:eq(1)").addClass("active");
$("#tabHeader").addClass("in active");
loadHeader();
@@ -513,9 +527,109 @@
detail();
}
- function matserAdd() {
+ function masterAdd() {
var url = prefix+"/add";
- $.modal.open("添加" + $.table._option.modalName, url);
+ $.modal.open("添加波次主表", url);
+ }
+
+ function masterEdit(id) {
+ var url = prefix+"/edit/"+id;
+ $.modal.open("修改主表",url);
+ }
+
+ function masterDel(id) {
+ $.modal.confirm("确定删除该条波次主表信息吗？", function() {
+ var url = prefix+"remove";
+ var data = { "ids": id };
+ $.operate.submit(url, "post", "json", data);
+ });
+ }
+
+ function masterBatRemove() {
+ var rows = $("#bootstrap-table").bootstrapTable('getSelections');
+ if (rows.length == 0) {
+ $.modal.alertWarning("请至少选择一条记录");
+ return;
+ }
+ $.modal.confirm("确认要删除选中的" + rows.length + "条数据吗?", function() {
+ var url = prefix+"/remove";
+ var ids;
+ $.each(rows, function (i, row) {
+ ids = row.id+",";
+ });
+ var data = { "ids": ids };
+ $.operate.submit(url, "post", "json", data);
+ });
+ }
+
+ function headerAdd() {
+ var url = prefix1+"/add";
+ $.modal.open("添加主表", url);
+ }
+
+ function headerEdit(id){
+ var url = prefix1+"/edit/"+id;
+ $.modal.open("修改主表", url);
+ }
+
+ function headerRemove(id) {
+ $.modal.confirm("确定删除该条主表信息吗？", function() {
+ var url = prefix1+"remove";
+ var data = { "ids": id };
+ $.operate.submit(url, "post", "json", data);
+ });
+ }
+
+ function headerBatRemove() {
+ var rows = $("#bootstrap-table1").bootstrapTable('getSelections');
+ if (rows.length == 0) {
+ $.modal.alertWarning("请至少选择一条记录");
+ return;
+ }
+ $.modal.confirm("确认要删除选中的" + rows.length + "条数据吗?", function() {
+ var url = prefix1+"/remove";
+ var ids;
+ $.each(rows, function (i, row) {
+ ids = row.id+",";
+ });
+ var data = { "ids": ids };
+ $.operate.submit(url, "post", "json", data);
+ });
+ }
+
+ function detailAdd() {
+ var url = prefix2+"/add";
+ $.modal.open("添加明细", url);
+ }
+
+ function detailEdit(id) {
+ var url = prefix2+"/edit/"+id;
+ $.modal.open("修改明细", url);
+ }
+
+ function detailRemove(id) {
+ $.modal.confirm("确定删除该条明细信息吗？", function() {
+ var url = prefix2+"remove";
+ var data = { "ids": id };
+ $.operate.submit(url, "post", "json", data);
+ });
+ }
+
+ function detailBatRemove() {
+ var rows = $("#bootstrap-table2").bootstrapTable('getSelections');
+ if (rows.length == 0) {
+ $.modal.alertWarning("请至少选择一条记录");
+ return;
+ }
+ $.modal.confirm("确认要删除选中的" + rows.length + "条数据吗?", function() {
+ var url = prefix2+"/remove";
+ var ids;
+ $.each(rows, function (i, row) {
+ ids = row.id+",";
+ });
+ var data = { "ids": ids };
+ $.operate.submit(url, "post", "json", data);
+ });
}
</script>
</body>
diff --git a/src/main/resources/templates/inventory/adjustDetail/adjustDetail.html b/src/main/resources/templates/inventory/adjustDetail/adjustDetail.html
index b38a854..8d62267 100644
--- a/src/main/resources/templates/inventory/adjustDetail/adjustDetail.html
+++ b/src/main/resources/templates/inventory/adjustDetail/adjustDetail.html
@@ -94,8 +94,8 @@
<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()">
<i class="fa fa-plus"></i> 新增
</a>
- <a class="btn btn-outline btn-primary btn-rounded" onclick="">
- <i class="fa fa-edit"></i> 审核
+ <a class="btn btn-outline btn-primary btn-rounded" onclick="agree()">
+ <i class="fa fa-edit"></i> 审批
</a>
<a class="btn btn-outline btn-danger btn-rounded" onclick="addAdjust()"/>
<!--shiro:hasPermission="inventory:cyclecountAdjustDetail:addAdjust"-->
@@ -320,7 +320,7 @@
align: 'center',
formatter: function (value, row, index) {
var actions = [];
- actions.push('<a class="btn btn-danger btn-xs" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a> ');
+ actions.push('<a class="btn btn-danger btn-xs" href="#" onclick="remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a> ');
return actions.join('');
}
}
@@ -353,10 +353,22 @@
});
+ /*审批*/
+ function agree() {
+ var rows = $.common.isEmpty($.table._option.id) ? $.table.selectFirstColumns() : $.table.selectColumns($.table._option.id);
+ if (rows.length == 0) {
+ $.modal.alertWarning("请至少选择一条记录");
+ return;
+ }
+ $.modal.confirm("审批请谨慎核对数据！"
+ , function() {
+ var url = prefix + "/adjustAgree";
+ var data = { "ids": rows.join() };
+ postInner(url, data);
+ });
+ }
- /*
- *盘点差异调整
- * */
+ /*调整*/
function addAdjust() {
var rows = $.common.isEmpty($.table._option.id) ? $.table.selectFirstColumns() : $.table.selectColumns($.table._option.id);
if (rows.length == 0) {
@@ -365,9 +377,49 @@
}
$.modal.confirm("注意：该操作将更改库存，当实盘数量为0且库位上只剩空容器时，请手动执行空托出库任务,容器上有货则无需其他操作！"
, function() {
- var url = prefix + "/adjustEdit";
- var data = { "ids": rows.join() };
- postInner(url, data);
+ var url = prefix + "/adjustEdit";
+ var data = { "ids": rows.join() };
+ postInner(url, data);
+ });
+ }
+
+ function postInner(url,data) {
+ $.modal.loading("正在处理中，请稍后...");
+ $.ajax({
+ url:url,
+ type:"post",
+ data:data,
+ success:function (result) {
+ if (result.code == web_status.SUCCESS) {
+ $.modal.msgSuccess(result.msg);
+ $.table.refresh();
+ } else {
+ $.modal.alertError(result.msg);
+ }
+ $.modal.closeLoading();
+ }
+ })
+ }
+
+ /*单条删除*/
+ function remove(id) {
+ $.modal.confirm("确定删除该条" + $.table._option.modalName + "信息吗？", function() {
+ var url = prefix+"/remove";
+ var data = { "id": id };
+ $.ajax({
+ url: url,
+ type:"post",
+ data:data,
+ success:function (result) {
+ if (result.code == web_status.SUCCESS) {
+ $.modal.msgSuccess(result.msg);
+ $.table.refresh();
+ } else {
+ $.modal.alertError(result.msg);
+ }
+ $.modal.closeLoading();
+ }
+ })
});
}
@@ -402,24 +454,6 @@
// shadeClose: true, //点击遮罩关闭层
})
}
- function postInner(url,data) {
- $.modal.loading("正在处理中，请稍后...");
- $.ajax({
- url:url,
- type:"post",
- data:data,
- success:function (result) {
- if (result.code == web_status.SUCCESS) {
- $.modal.msgSuccess(result.msg);
- update();
- } else {
- $.modal.alertError(result.msg);
- }
- $.modal.closeLoading();
- }
- })
- }
-
</script>
</body>
diff --git a/src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html b/src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html
index 27614b7..74d6ec0 100644
--- a/src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html
+++ b/src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html
@@ -50,6 +50,7 @@
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
+ <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('receiptContainerHeader-form')"><i class="fa fa-refresh"></i> 重置</a>
<!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="receipt:receiptHeader:export"><i class="fa fa-download"></i> 导出</a>-->
</li>
</ul>
diff --git a/src/main/resources/templates/receipt/receiptDetail/receiptDetail.html b/src/main/resources/templates/receipt/receiptDetail/receiptDetail.html
index 8a22280..9bd9d9b 100644
--- a/src/main/resources/templates/receipt/receiptDetail/receiptDetail.html
+++ b/src/main/resources/templates/receipt/receiptDetail/receiptDetail.html
@@ -24,6 +24,7 @@
<!--</li>-->
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
+ <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('receiptDetail-form')"><i class="fa fa-refresh"></i> 重置</a>
<!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="receipt:receiptDetail:export"><i class="fa fa-download"></i> 导出</a>-->
</li>
</ul>
diff --git a/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html b/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
index 16ee09c..96aee72 100644
--- a/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
+++ b/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
@@ -36,7 +36,7 @@
入库单号：<input type="text" name="code"/>
</li>
<li>
- 上游单号：<input type="text" name="sourceCode"/>
+ 上游单号：<input type="text" name="referCode"/>
</li>
<li>
货主：<select id="companyCode" name="companyCode" th:with="list=${@companyService.getCode()}">
@@ -72,6 +72,7 @@
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
+ <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('receiptHeader-form')"><i class="fa fa-refresh"></i> 重置</a>
</li>
</ul>
</div>
diff --git a/src/main/resources/templates/receipt/receiptHeaderHistory/receiptHeaderHistory.html b/src/main/resources/templates/receipt/receiptHeaderHistory/receiptHeaderHistory.html
index 00df531..3d02497 100644
--- a/src/main/resources/templates/receipt/receiptHeaderHistory/receiptHeaderHistory.html
+++ b/src/main/resources/templates/receipt/receiptHeaderHistory/receiptHeaderHistory.html
@@ -21,6 +21,9 @@
入库单号：<input type="text" name="code"/>
</li>
<li>
+ 上游单号：<input type="text" name="referCode"/>
+ </li>
+ <li>
<!--入库类型：<input type="text" name="sourceCode"/>-->
入库类型：<select name="type" th:with="type=${@receiptTypeService.getType()}">
<option value="">所有</option>