src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
@@ -1,19 +1,16 @@ package com.zy.asrs.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.plugins.Page; import com.core.common.DateUtils; import com.zy.asrs.entity.DocType; import com.zy.asrs.entity.InventoryCheckOrder; import com.zy.asrs.entity.Order; import com.zy.asrs.service.InventoryCheckOrderService; import com.core.annotations.ManagerAuth; import com.core.common.BaseRes; import com.core.common.Cools; import com.core.common.DateUtils; import com.core.common.R; import com.zy.asrs.entity.InventoryCheckOrder; import com.zy.asrs.service.InventoryCheckOrderService; import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -82,11 +79,25 @@ } } @RequestMapping(value = "/inventoryCheckOrder/add/auth") @PostMapping (value = "/inventoryCheckOrder/add/auth") @ManagerAuth public R add(InventoryCheckOrder inventoryCheckOrder) { public R add(@RequestBody InventoryCheckOrder inventoryCheckOrder) { String orderNo = inventoryCheckOrder.getOrderNo(); if (Cools.isEmpty(orderNo)) { return R.parse("单据编号不能为空：" + orderNo); } int count = inventoryCheckOrderService.selectCount(new EntityWrapper<InventoryCheckOrder>().eq("order_no", orderNo)); if (count > 0) { return R.parse("单据编号已经存在：" + orderNo); } inventoryCheckOrder.setCreateBy(getUserId().toString()); inventoryCheckOrder.setCreateTime(new Date()); inventoryCheckOrder.setStatus("1"); inventoryCheckOrderService.insert(inventoryCheckOrder); return R.ok(); return R.ok(orderNo + "新增成功"); } @RequestMapping(value = "/inventoryCheckOrder/update/auth") src/main/java/com/zy/asrs/controller/InventoryCheckOrderDetlController.java
@@ -1,25 +1,26 @@ package com.zy.asrs.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.plugins.Page; import com.core.common.DateUtils; import com.zy.asrs.entity.InventoryCheckOrder; import com.zy.asrs.entity.InventoryCheckOrderDetl; import com.zy.asrs.entity.OrderDetl; import com.zy.asrs.service.InventoryCheckOrderDetlService; import com.core.annotations.ManagerAuth; import com.core.common.BaseRes; import com.core.common.Cools; import com.core.common.DateUtils; import com.core.common.R; import com.zy.asrs.entity.InventoryCheckOrder; import com.zy.asrs.entity.InventoryCheckOrderDetl; import com.zy.asrs.service.InventoryCheckOrderDetlService; import com.zy.asrs.service.InventoryCheckOrderService; import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.*; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @RestController public class InventoryCheckOrderDetlController extends BaseController { src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js
@@ -87,6 +87,81 @@ return false; }); // 显示弹框 $('#showFormBtn').on('click', function () { // 弹框内容 var content = ` <form class="layui-form" id="billForm" style="padding: 20px;"> <div class="layui-form-item" style="margin-bottom: 20px;"> <label class="layui-form-label" style="width: 80px; font-size: 14px; text-align: left">单据编号：</label> <div class="layui-input-block" style="margin-left: 110px;"> <input type="text" id="billNumber" class="layui-input" placeholder="请输入单据编号" style="height: 38px; font-size: 14px; padding: 0 15px; width: 100%;" required> </div> </div> <div class="layui-form-item" style="margin-bottom: 20px;"> <label class="layui-form-label" style="width: 80px; font-size: 14px;">库区：</label> <div class="layui-input-block" style="margin-left: 110px;"> <select id="warehouseArea" class="layui-input" style="width: 100%;"> <option value="堆垛机" selected>堆垛机</option> <option value="四向库">四向库</option> <option value="CTU">CTU</option> </select> </div> </div> <div class="layui-form-item" style="text-align: right;"> <button type="button" class="layui-btn" id="saveBtn" style="display: inline-block; padding: 0px 20px; font-size: 16px; background-color: #5FB878; border-color: #5FB878; text-align: center;">保存</button> </div> </form> `; // 弹框 layer.open({ type: 1, // 使用 HTML 内容 title: '添加盘点单', content: content, area: ['400px', '280px'], // 弹框大小 shadeClose: true, // 点击遮罩关闭 offset: '100px', success: function (layero, index) { form.render(); // 点击保存按钮事件 $('#saveBtn').on('click', function () { var billNumber = $('#billNumber').val(); var warehouseArea = $('#warehouseArea').val(); // 表单验证 if (!billNumber) { layer.msg('请输入单据编号'); return; } console.log(111) console.log(billNumber) // 发送 Ajax 请求到后端 $.ajax({ url: baseUrl+"/inventoryCheckOrder/add/auth", // 替换为你的后端接口地址 headers: {'token': localStorage.getItem('token')}, contentType: 'application/json;charset=UTF-8', method: 'POST', data: JSON.stringify({ orderNo: billNumber,area: warehouseArea }), success: function (res) { if (res.code === 200){ layer.msg(res.msg, {icon: 1}); } else if (res.code === 403){ top.location.href = baseUrl+"/"; }else { layer.msg(res.msg, {icon: 2}); } }, error: function () { layer.msg('请求失败'); } }); }); } }); }); /* 表格2头工具栏点击事件 */ table.on('toolbar(orderDetlTable)', function (obj) {
@@ -92,6 +92,7 @@ <div class="layui-col-md9"> <div class="layui-card"> <div class="layui-card-body" style="padding: 10px;"> <button id="showFormBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon"></i>添加</button> <!-- <form class="layui-form toolbar">--> <!-- <div class="layui-form-item">--> <!--<!– <div class="layui-inline">–>-->
