From a31fd78f2d869baada07c69fea779c9682904549 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 19 十一月 2024 08:17:04 +0800
Subject: [PATCH] 盘点单生成
---
src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js | 75 +++++++++++++++++++++++++
src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java | 29 ++++++---
src/main/java/com/zy/asrs/controller/InventoryCheckOrderDetlController.java | 15 ++--
src/main/webapp/views/inventoryCheckOrder/inventoryCheckOrder.html | 3
4 files changed, 105 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
index 7afaeab..f60d972 100644
--- a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
+++ b/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")
diff --git a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderDetlController.java b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderDetlController.java
index 0c48f3c..7e1e31b 100644
--- a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderDetlController.java
+++ b/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 {
diff --git a/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js b/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js
index 0035a85..417749e 100644
--- a/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js
+++ b/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) {
diff --git a/src/main/webapp/views/inventoryCheckOrder/inventoryCheckOrder.html b/src/main/webapp/views/inventoryCheckOrder/inventoryCheckOrder.html
index 03115d2..11105c5 100644
--- a/src/main/webapp/views/inventoryCheckOrder/inventoryCheckOrder.html
+++ b/src/main/webapp/views/inventoryCheckOrder/inventoryCheckOrder.html
@@ -92,7 +92,8 @@
<div class="layui-col-md9">
<div class="layui-card">
<div class="layui-card-body" style="padding: 10px;">
-<!-- <form class="layui-form toolbar">-->
+ <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">–>-->
<!--<!– <label class="layui-form-label">鍟嗗搧缂栫爜:</label>–>-->
--
Gitblit v1.9.1