From 92b7f23ac753fa576d8a6bcd10ad8be07672dd46 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 26 九月 2023 15:24:19 +0800
Subject: [PATCH] 库存汇总加上平库的库存
---
src/main/webapp/static/js/locDetl/locDetl.js | 34 -----
src/main/java/com/zy/asrs/entity/AllLocDetl.java | 122 --------------------
src/main/webapp/static/js/allLocDetl/locDetl.js | 44 ++-----
src/main/webapp/views/allLocDetl/locDetl.html | 22 ++
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 3
src/main/webapp/views/saasPakStore/stockAdjust.html | 133 ++++++++++++++++++++++
6 files changed, 167 insertions(+), 191 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/AllLocDetl.java b/src/main/java/com/zy/asrs/entity/AllLocDetl.java
index a532bda..30e1bed 100644
--- a/src/main/java/com/zy/asrs/entity/AllLocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/AllLocDetl.java
@@ -70,73 +70,27 @@
@ApiModelProperty(value= "鍗曚环")
private Double price;
- @ApiModelProperty(value= "sku")
- private String sku;
-
@ApiModelProperty(value= "鍖呮暟")
private Double units;
@ApiModelProperty(value= "鏉＄爜")
private String barcode;
- @ApiModelProperty(value= "鐗╂枡鐘舵��")
- private String origin;
-
- @ApiModelProperty(value= "鍘傚")
- private String manu;
-
- @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
- @TableField("manu_date")
- private String manuDate;
-
- @ApiModelProperty(value= "鍝侀」鏁�")
- @TableField("item_num")
- private String itemNum;
-
@ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
@TableField("safe_qty")
private Double safeQty;
-
- @ApiModelProperty(value= "閲嶉噺")
- private Double weight;
-
- @ApiModelProperty(value= "闀垮害")
- private Double length;
-
- @ApiModelProperty(value= "浣撶Н")
- private Double volume;
@ApiModelProperty(value= "涓夋柟缂栫爜")
@TableField("three_code")
private String threeCode;
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supp;
-
@ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
@TableField("supp_code")
private String suppCode;
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
- @TableField("be_batch")
- private Integer beBatch;
-
@ApiModelProperty(value= "淇濊川鏈�")
@TableField("dead_time")
private String deadTime;
-
- @ApiModelProperty(value= "棰勮澶╂暟")
- @TableField("dead_warn")
- private Integer deadWarn;
-
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
- private Integer source;
-
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer inspect;
-
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
- private Integer danger;
@ApiModelProperty(value= "淇敼浜哄憳")
@TableField("modi_user")
@@ -145,17 +99,6 @@
@ApiModelProperty(value= "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
-
- @ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
- private Long appeUser;
-
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
- private Date appeTime;
-
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
@TableField("stock_freeze")
@ApiModelProperty(value= "搴撳瓨鍐荤粨{1:姝ｅ父,0:鍐荤粨}")
@@ -170,55 +113,6 @@
return null;
}
- public String getBeBatch$(){
- if (null == this.beBatch){ return null; }
- switch (this.beBatch){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.beBatch);
- }
- }
-
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
- case 1:
- return "鍒堕��";
- case 2:
- return "閲囪喘";
- case 3:
- return "澶栧崗";
- default:
- return String.valueOf(this.source);
- }
- }
-
- public String getInspect$(){
- if (null == this.inspect){ return null; }
- switch (this.inspect){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.inspect);
- }
- }
-
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.danger);
- }
- }
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
@@ -234,22 +128,6 @@
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
public void sync(Object source) {
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index a8bf17a..66a8f06 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -166,7 +166,8 @@
waitPakin.sync(mat);
waitPakin.setOrderNo(orderNo); // 鍗曟嵁缂栧彿
waitPakin.setBatch(detlDto.getBatch()); // 搴忓垪鐮�
- waitPakin.setZpallet(zpallet); // 鎵樼洏鐮�
+ //waitPakin.setZpallet(zpallet); // 鎵樼洏鐮�
+ waitPakin.setSuppCode(zpallet); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
waitPakin.setStatus("Y"); // 鐘舵��
diff --git a/src/main/webapp/static/js/allLocDetl/locDetl.js b/src/main/webapp/static/js/allLocDetl/locDetl.js
index 073a915..b0cbf25 100644
--- a/src/main/webapp/static/js/allLocDetl/locDetl.js
+++ b/src/main/webapp/static/js/allLocDetl/locDetl.js
@@ -2,40 +2,24 @@
var tableData;
function getCol() {
var cols = [
- {field: 'locNo', align: 'center',title: '搴撲綅鍙�'},
- {field: 'matnr', align: 'center',title: '鐗╂枡鍙�', sort:true}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О', sort:true}
+ {field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'suppCode', align: 'center',title: '鏂欑鐮�', sort:true}
+ ,{field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜', sort:true}
+ ,{field: 'maktx', align: 'center',title: '瀛樿揣鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
- ,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true}
+ ,{field: 'batch', align: 'center',title: '搴忓垪鐮�', sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'units', align: 'center',title: '閿�鍞鍗曞彿', hide: true}
+ ,{field: 'units', align: 'center',title: '閿�鍞鍗曡鍙�', hide: true}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
-
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸鍨嬪彿', hide: true}
,{field: 'model', align: 'center',title: '閫氱敤鍨嬪彿', hide: true}
- ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
- ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
- ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: 'sku', hide: true}
- ,{field: 'units', align: 'center',title: '鍖呮暟', hide: true}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '鐗╂枡鐘舵��', hide: true}
- ,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
- ,{field: 'manuDate', align: 'center',title: '鍗曟嵁鏃堕棿', hide: true}
- ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
- ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
- ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
- ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
- ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
- ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
- ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
- ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
- ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
- ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
- ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
- ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
- ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+ ,{field: 'brand', align: 'center',title: '瀛樿揣鍒嗙被缂栫爜', hide: true}
+ ,{field: 'color', align: 'center',title: '瀛樿揣鍒嗙被鍚嶇О', hide: true}
+ ,{field: 'unit', align: 'center',title: '璁￠噺鍗曚綅', hide: true}
+ ,{field: 'price', align: 'center',title: '杩涢」绋�', hide: true}
+ ,{field: 'units', align: 'center',title: '閿�椤圭◣', hide: true}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
];
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index b3063d8..bb3d566 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -3,7 +3,7 @@
function getCol() {
var cols = [
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'matnr', align: 'center',title: '鏂欑鐮�', sort:true}
+ ,{field: 'suppCode', align: 'center',title: '鏂欑鐮�', sort:true}
,{field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜', sort:true}
,{field: 'maktx', align: 'center',title: '瀛樿揣鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
@@ -19,39 +19,7 @@
,{field: 'unit', align: 'center',title: '璁￠噺鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '杩涢」绋�', hide: true}
,{field: 'units', align: 'center',title: '閿�椤圭◣', hide: true}
- //,{field: 'dsDate', align: 'center',title: '鍚敤鏃ユ湡', hide: true}
- //,{field: 'supp', align: 'center',title: '寤烘。浜�', hide: true}
- //,{field: 'dInvCreateDatetime', align: 'center',title: '寤烘。鏃ユ湡', hide: true}
- //,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
- //,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
-
- // ,{field: 'specs', align: 'center',title: '瑙勬牸'}
- // ,{field: 'model', align: 'center',title: '閫氱敤鍨嬪彿', hide: true}
- // ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
- // ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
- // ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
- // ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- // ,{field: 'sku', align: 'center',title: 'sku', hide: true}
- // ,{field: 'units', align: 'center',title: '鍖呮暟', hide: true}
- // ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- // ,{field: 'origin', align: 'center',title: '鐗╂枡鐘舵��', hide: true}
- // ,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
- // ,{field: 'manuDate', align: 'center',title: '鍗曟嵁鏃堕棿', hide: true}
- // ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
- // ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- // ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
- // ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
- // ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
- // ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
- // ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
- // ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
- // ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
- // ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
- // ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
- // ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
- // ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
- // ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
];
diff --git a/src/main/webapp/views/allLocDetl/locDetl.html b/src/main/webapp/views/allLocDetl/locDetl.html
index 7ad2afa..69897c7 100644
--- a/src/main/webapp/views/allLocDetl/locDetl.html
+++ b/src/main/webapp/views/allLocDetl/locDetl.html
@@ -31,15 +31,27 @@
</div>
<!-- <div class="layui-inline">-->
<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="loc_type" placeholder="搴撳尯閫夋嫨" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-input-inline">
+ <select id="floorSelect" name="loc_type" lay-filter="floorSelect">
+ <option value="1">AGV搴撳尯</option>
+ <option value="2">鍥涢」搴撳尯</option>
+ <option value="3">骞冲簱鍖�</option>
+ </select>
+ </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
<!-- <input class="layui-input" type="text" name="row" placeholder="鎺掓暟" autocomplete="off">-->
<!-- </div>-->
<!-- </div>-->
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">-->
+<!-- </div>-->
- </div>
+<!-- </div>-->
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
diff --git a/src/main/webapp/views/saasPakStore/stockAdjust.html b/src/main/webapp/views/saasPakStore/stockAdjust.html
new file mode 100644
index 0000000..a955381
--- /dev/null
+++ b/src/main/webapp/views/saasPakStore/stockAdjust.html
@@ -0,0 +1,133 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+ <style>
+ html {
+ height: 100%;
+ padding: 10px;
+ background-color: #f1f1f1;
+ box-sizing: border-box;
+ }
+ body {
+ background-color: #fff;
+ border-radius: 5px;
+ box-shadow: 0 0 3px rgba(0,0,0,.3);
+ }
+
+ /* search */
+ .layui-card-header {
+ border-bottom: none;
+ }
+ #search-box {
+ padding: 30px 0 10px 0;
+ }
+ #search-box .layui-inline:first-child {
+ margin-left: 30px;
+ }
+ #search-box .layui-inline {
+ margin-right: 5px;
+ }
+
+ #data-search-btn {
+ margin-left: 10px;
+ display: inline-block;
+ }
+ #data-search-btn.layui-btn-container .layui-btn {
+ margin-right: 20px;
+ }
+
+ /* add */
+ .function-area {
+ padding: 15px 0 20px 40px;
+ }
+ .function-btn {
+ font-size: 16px;
+ padding: 1px 1px 1px 1px;
+ width: 120px;
+ height: 40px;
+ border-color: #2b425b;
+ border-radius: 4px;
+ border-width: 1px;
+ background: none;
+ border-style: solid;
+ transition: 0.4s;
+ cursor: pointer;
+ }
+ .function-btn:hover {
+ background-color: #2b425b;
+ color: #fff;
+ }
+
+ #mat-query {
+ display: none;
+ }
+ #btn-adjust {
+ display: none;
+ }
+ </style>
+</head>
+<body style="padding-bottom: 30px">
+
+<!-- 鎼滅储鏍� -->
+<div id="search-box" class="layui-form layui-card-header">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input id="searchLocNo" class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off" style="height: 45px;border-color: #b8b8b8">
+ </div>
+ </div>
+ <!-- 寰呮坊鍔� -->
+ <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
+ <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">妫�绱�</button>
+ <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+ </div>
+ <!-- 搴撲綅鎻愮ず -->
+ <div style="display: inline-block; font-size: 20px;font-weight: 300">
+ <div class="not-retrieve" style="color: #ff0000;font-family: '榛戜綋';">
+ 璇峰厛妫�绱㈠簱浣�
+ </div>
+ <div class="retrieve" style="display: none;color: #0097ff;font-family: '榛戜綋';">
+ 褰撳墠妫�绱㈠簱浣�: <span id="locMsg" style=""></span>
+ </div>
+
+ </div>
+</div>
+
+<hr>
+
+<!-- 鍔熻兘鍖� -->
+<div class="function-area">
+ <button id="mat-query" class="function-btn">鏂板搴撳瓨</button>
+</div>
+
+<!-- 澶撮儴 -->
+<script type="text/html" id="toolbar">
+ <button class="layui-btn layui-btn-lg" id="btn-adjust" lay-event="adjust" style="">璋冩暣搴撳瓨</button>
+</script>
+
+<!-- 琛� -->
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove">绉婚櫎</a>
+</script>
+
+<!-- 琛ㄦ牸 -->
+<table class="layui-table" id="chooseData" lay-filter="chooseData"></table>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+<script type="text/javascript" src="../../static/js/agvPakStore/stockAdjust.js" charset="utf-8"></script>
+
+</body>
+</html>
+
--
Gitblit v1.9.1