From 7204baeea8ec45bf90113f7d812db30de65d1229 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期二, 22 三月 2022 18:23:10 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/QualityController.java | 42 ++++++
src/main/webapp/views/receive/receive.html | 2
src/main/java/zy/cloud/wms/manager/entity/Quality.java | 5
src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java | 2
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 1
src/main/webapp/static/js/receiveDetl/receiveDetl.js | 16 ++
src/main/webapp/views/quality/quality.html | 57 +++-----
src/main/webapp/views/quality/waitMatoutQuery.html | 6
src/main/java/zy/cloud/wms/manager/entity/QualityDetl.java | 3
src/main/webapp/views/receiveDetl/receiveDetl.html | 2
src/main/webapp/static/js/quality/quality.js | 74 ++++++++---
src/main/webapp/views/receive/matQuery.html | 6
src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java | 44 ++++++-
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 19 +++
src/main/java/zy/cloud/wms/manager/controller/QualityDetlController.java | 12 +
src/main/webapp/static/js/receive/matRecQuery.js | 17 ++
16 files changed, 227 insertions(+), 81 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/QualityController.java b/src/main/java/zy/cloud/wms/manager/controller/QualityController.java
index 9a105dd..0a974ff 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/QualityController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/QualityController.java
@@ -5,16 +5,19 @@
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.core.common.*;
+import org.apache.poi.ss.formula.functions.Now;
import zy.cloud.wms.manager.entity.Quality;
+import zy.cloud.wms.manager.entity.QualityDetl;
+import zy.cloud.wms.manager.entity.Receive;
+import zy.cloud.wms.manager.entity.ReceiveDetl;
+import zy.cloud.wms.manager.service.QualityDetlService;
import zy.cloud.wms.manager.service.QualityService;
import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
import zy.cloud.wms.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import zy.cloud.wms.manager.service.ReceiveDetlService;
import java.util.*;
@@ -23,6 +26,12 @@
@Autowired
private QualityService qualityService;
+ @Autowired
+ private ReceiveDetlService receiveDetlService;
+ @Autowired
+ private QualityDetlService qualityDetlService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
@RequestMapping(value = "/quality/{id}/auth")
@ManagerAuth
@@ -61,6 +70,20 @@
@ManagerAuth
public R add(Quality quality) {
qualityService.insert(quality);
+ Wrapper<ReceiveDetl> wrapper = new EntityWrapper<ReceiveDetl>();
+ List<ReceiveDetl> list = receiveDetlService.selectList(wrapper.eq("order_no",quality.getUuid() ));
+ if(list.size()>0){
+ for(ReceiveDetl detl:list){
+ QualityDetl qualityDetl = new QualityDetl();
+ qualityDetl.setAnfme(detl.getAnfme());
+ qualityDetl.setBillNo(quality.getBillNo());
+ qualityDetl.setOrderNo(detl.getOrderNo());
+ qualityDetl.setMatnr(detl.getMatnr());
+ qualityDetl.setMaktx(detl.getMaktx());
+ qualityDetl.setProdDate(new Date());
+ qualityDetlService.insert(qualityDetl);
+ }
+ }
return R.ok();
}
@@ -83,6 +106,17 @@
return R.ok();
}
+// @RequestMapping("/orderNo/init1")
+// @ManagerAuth(memo = "鐢熸垚鍗曟嵁缂栧彿")
+// public R initOrderNo() {
+// long nextId = snowflakeIdWorker.nextId();
+// String orderNo = "QC-" + String.valueOf(nextId).substring(0, 15);
+// if (qualityService.selectByOrderNo(orderNo, getHostId()) != null) {
+// return R.error("鎶辨瓑锛屽崟鎹紪鍙峰凡瀛樺湪");
+// }
+// return R.ok().add(orderNo);
+// }
+
@RequestMapping(value = "/quality/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
diff --git a/src/main/java/zy/cloud/wms/manager/controller/QualityDetlController.java b/src/main/java/zy/cloud/wms/manager/controller/QualityDetlController.java
index c7adda7..0fd7e8c 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/QualityDetlController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/QualityDetlController.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
+import zy.cloud.wms.manager.entity.Quality;
import zy.cloud.wms.manager.entity.QualityDetl;
import zy.cloud.wms.manager.service.QualityDetlService;
import com.core.annotations.ManagerAuth;
@@ -15,6 +16,7 @@
import zy.cloud.wms.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import zy.cloud.wms.manager.service.QualityService;
import java.util.*;
@@ -23,7 +25,8 @@
@Autowired
private QualityDetlService qualityDetlService;
-
+ @Autowired
+ private QualityService qualityService;
@RequestMapping(value = "/qualityDetl/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
@@ -52,7 +55,7 @@
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), val);
+ wrapper.eq(entry.getKey(), val);
}
}
}
@@ -70,6 +73,11 @@
if (Cools.isEmpty(qualityDetl) || null==qualityDetl.getId()){
return R.error();
}
+ if(!Cools.isEmpty(qualityDetl.getQuaStatus())){
+ Quality quality= qualityService.selectOne(new EntityWrapper<Quality>().eq("bill_no",qualityDetl.getBillNo()));
+ quality.setAuditStatus(Short.valueOf("1"));
+ qualityService.updateById(quality);
+ }
qualityDetlService.updateById(qualityDetl);
return R.ok();
}
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java b/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java
index f3000b3..d4335cb 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java
@@ -40,7 +40,7 @@
return R.ok(receiveDetlService.selectById(String.valueOf(id)));
}
- @RequestMapping(value = "/receiveDetl/list/auth")
+ @RequestMapping(value ="/receiveDetl/list/auth")
@ManagerAuth
public R list(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@@ -48,10 +48,11 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
EntityWrapper<ReceiveDetl> wrapper = new EntityWrapper<>();
+ param.values();
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(receiveDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(receiveDetlService.selectPage(new Page<>(curr, limit), wrapper.orderBy("id",false)));
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
@@ -153,8 +154,6 @@
}
Node targetLoc = nodeService.selectOne(new EntityWrapper<Node>()
.eq("id", putShelfDTO.getSelect()));
-
-
/**
* 鏇存柊搴撳瓨
*/
@@ -190,10 +189,43 @@
ReceiveDetl targetRece = receiveDetlService.selectOne(new EntityWrapper<ReceiveDetl>()
.eq("id", putShelfDTO.getId()));
- targetRece.setInQty((int) (targetRece.getInQty() + remain));
+ targetRece.setInQty((targetRece.getInQty() + remain));
receiveDetlService.update(targetRece,new EntityWrapper<ReceiveDetl>()
.eq("id",targetRece.getId()));
+ /**
+ * 鍙嶅啓璁㈠崟鐘舵��
+ */
+ if(!Cools.isEmpty(putShelfDTO.getOrderNo())){
+ List<ReceiveDetl> list = receiveDetlService.selectList(new EntityWrapper<ReceiveDetl>().eq("order_no",putShelfDTO.getOrderNo()));
+ boolean flag = true;
+ if(list.size()>0){
+ for (ReceiveDetl receiveDetl : list){
+ if(receiveDetl.getInQty() < receiveDetl.getCount()){
+ flag = false;
+ break;
+ }
+ }
+ }
+
+ if(flag){
+ Receive receive = receiveService.selectOne(new EntityWrapper<Receive>().eq("order_no",putShelfDTO.getOrderNo()));
+ receive.setSettle(Long.valueOf(4));
+ receiveService.updateById(receive);
+ }
+// ReceiveDetl receiveDetl = receiveDetlService.selectOne(new EntityWrapper<ReceiveDetl>().eq("order_no",putShelfDTO.getOrderNo()).eq("matnr",putShelfDTO.getMatnr()));
+// for(int i=0;i<list.size();i++){
+// if(list.get(i).getMatnr().equals(receiveDetl.getMatnr())){
+// if(list.get(i).getInQty()>=list.get(i).getCount()){
+// Receive receive = receiveService.selectOne(new EntityWrapper<Receive>().eq("order_no",putShelfDTO.getOrderNo()));
+// receive.setSettle(Long.valueOf(4));
+// receiveService.updateById(receive);
+// break;
+// }
+// }
+// }
+
+ }
/**
* 涓婃灦瀹屾垚涔嬪悗,瀛樻斁鏁版嵁鑷充笂鏋剁粺璁¤〃 man_receive_log
*/
@@ -258,7 +290,7 @@
/**
* 鍙嶅啓鍥炲叆搴撴。
*/
- receiveDetl.setInQty(0);
+ receiveDetl.setInQty(0.0);
receiveDetl.setUpdateTime(new Date());
receiveDetl.setUpdateBy(getUserId());
receiveDetlService.update(receiveDetl,new EntityWrapper<ReceiveDetl>()
diff --git a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
index adccc5e..42162dc 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -17,7 +17,9 @@
import zy.cloud.wms.manager.entity.result.KeyValueVo;
import zy.cloud.wms.manager.service.*;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -145,13 +147,28 @@
@ManagerAuth(memo = "鐢熸垚鍗曟嵁缂栧彿")
public R initOrderNo() {
long nextId = snowflakeIdWorker.nextId();
- String orderNo = "AT-" + String.valueOf(nextId).substring(0, 15);
+ SimpleDateFormat dateformat = new SimpleDateFormat("yyyyMMddHHmmss");
+ String orderNo = "AT-" + String.valueOf(dateformat.format(new Date()));
+ //String orderNo = "AT-" + String.valueOf(nextId).substring(0, 15);
if (orderService.selectByOrderNo(orderNo, getHostId()) != null) {
return R.error("鎶辨瓑锛屽崟鎹紪鍙峰凡瀛樺湪");
}
return R.ok().add(orderNo);
}
+// @RequestMapping("/orderNo/init1")
+// @ManagerAuth(memo = "鐢熸垚鍗曟嵁缂栧彿")
+// public R initOrderNo1() {
+// long nextId = snowflakeIdWorker.nextId();
+// SimpleDateFormat dateformat = new SimpleDateFormat("yyyyMMddHHmmss");
+// String orderNo = "AT-" + String.valueOf(dateformat.format(new Date()));
+// //String orderNo = "AT-" + String.valueOf(nextId).substring(0, 15);
+// if (orderService.selectByOrderNo(orderNo, getHostId()) != null) {
+// return R.error("鎶辨瓑锛屽崟鎹紪鍙峰凡瀛樺湪");
+// }
+// return R.ok().add(orderNo);
+// }
+
@RequestMapping("/receive/init")
@ManagerAuth(memo = "鐢熸垚閿�鍞鍗�")
public R initReceive(@RequestBody InitOrderParam param) {
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Quality.java b/src/main/java/zy/cloud/wms/manager/entity/Quality.java
index 6ec90b5..a5d01f8 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Quality.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Quality.java
@@ -1,5 +1,7 @@
package zy.cloud.wms.manager.entity;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableField;
@@ -34,7 +36,8 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id",type = IdType.AUTO)
private Long id;
@ApiModelProperty(value= "")
diff --git a/src/main/java/zy/cloud/wms/manager/entity/QualityDetl.java b/src/main/java/zy/cloud/wms/manager/entity/QualityDetl.java
index 242255f..9dcacfa 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/QualityDetl.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/QualityDetl.java
@@ -1,5 +1,7 @@
package zy.cloud.wms.manager.entity;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableField;
@@ -50,6 +52,7 @@
* ID
*/
@ApiModelProperty(value= "ID")
+ @TableId(value = "id",type = IdType.AUTO)
private Long id;
@ApiModelProperty(value= "")
diff --git a/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java b/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java
index 03e00f3..62a105a 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java
@@ -209,7 +209,7 @@
private String memo;
@TableField("in_qty")
- private int inQty;
+ private Double inQty;
@TableField("qua_status")
private int quaStatus;
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index 1728c29..47c3b4e 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -646,6 +646,7 @@
ReceiveDetl receiveDetl = new ReceiveDetl();
receiveDetl.setHostId(hostId);
receiveDetl.setOrderId(order_no.getId());
+ receiveDetl.setOrderNo(param.getOrderNo());
receiveDetl.setAnfme(dto.getCount());
receiveDetl.setCreateTime(now);
receiveDetl.setCreateBy(userId);
diff --git a/src/main/webapp/static/js/quality/quality.js b/src/main/webapp/static/js/quality/quality.js
index c0b6e7c..e1ac6c5 100644
--- a/src/main/webapp/static/js/quality/quality.js
+++ b/src/main/webapp/static/js/quality/quality.js
@@ -1,4 +1,5 @@
var pageCurr;
+var billNO;
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).use(['table','laydate', 'form', 'admin'], function(){
@@ -21,15 +22,15 @@
cellMinWidth: 50,
cols: [[
{type: 'checkbox'}
- ,{field: 'id', align: 'center',title: 'ID'}
+ //,{field: 'id', align: 'center',title: 'ID'}
,{field: 'billNo', align: 'center',title: '妫�楠岀紪鍙�'}
- ,{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 140, width: 140}
- ,{field: 'auditStatus$', align: 'center',title: '瀹℃牳鐘舵��', width: 100}
+ ,{field: 'auditStatus$', align: 'center',title: '瀹℃牳鐘舵��'}
,{field: 'memo', align: 'center',title: '澶囨敞', hide:true}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', width: 100}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 200}
- ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�', hide:true}
- ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿', hide:true}
+ ,{align: 'center', title: '鏄庣粏', toolbar: '#tbLook'}
+ ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'createBy$', align: 'center',title: '鍒涘缓鑰�', hide:true}
+ ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿', hide:true}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
]],
@@ -132,6 +133,7 @@
// 鐩戝惉琛屽伐鍏蜂簨浠�
table.on('tool(quality)', function(obj){
var data = obj.data;
+ billNO=data;
switch (obj.event) {
case 'edit':
showEditModel(data);
@@ -150,7 +152,7 @@
layer.open({
type: 1,
title: false,
- area: '2000px',
+ area: '1000px',
offset: [offset.top + 'px', (offset.left - 530 + $a.outerWidth()) + 'px'],
shade: .01,
shadeClose: true,
@@ -162,7 +164,7 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/qualityDetl/list/auth',
where: {
- quality_id: data.id
+ bill_no: data.billNo
},
limit: 5,
page: true,
@@ -170,16 +172,16 @@
cols: [[
// {type: 'numbers'},
// {field: 'billNo', title: '妫�楠岀紪鍙�', align: 'center'},
- {field: 'seqNo', title: '鍗曟嵁琛屽彿', align: 'center',width: 100},
- {field: 'orderNo', title: '鍏ュ簱鍗曞彿', align: 'center',width: 150},
- {field: 'anfme', title: '寰呭叆搴撴暟閲�', align: 'center',width: 100},
- {field: 'matnr', title: '浜у搧ID', align: 'center',width: 150},
- {field: 'maktx', title: '浜у搧鍚嶇О', align: 'center',width: 150},
+ {field: 'seqNo', title: '鍗曟嵁琛屽彿', align: 'center'},
+ {field: 'orderNo', title: '鍏ュ簱鍗曞彿', align: 'center'},
+ {field: 'anfme', title: '寰呭叆搴撴暟閲�', align: 'center'},
+ {field: 'matnr', title: '浜у搧ID', align: 'center'},
+ {field: 'maktx', title: '浜у搧鍚嶇О', align: 'center'},
// {field: 'maktx', title: '浜у搧鍚嶇О', align: 'center'},
- {field: 'prodDate$', title: '鐢熶骇鏃ユ湡', align: 'center',width: 150},
- {field: 'quaStatus$', title: '妫�楠岀姸鎬�', align: 'center',width: 100},
- {field: 'rejectQty', title: '涓嶅悎鏍兼暟閲�', align: 'center',width: 100},
- {field: 'rejectReason', title: '涓嶅悎鏍煎師鍥�', align: 'center',width: 150},
+ {field: 'prodDate$', title: '鐢熶骇鏃ユ湡', align: 'center'},
+ {field: 'quaStatus$', title: '妫�楠岀姸鎬�', align: 'center'},
+ {field: 'rejectQty', title: '涓嶅悎鏍兼暟閲�', align: 'center'},
+ {field: 'rejectReason', title: '涓嶅悎鏍煎師鍥�', align: 'center'},
]],
request: {
@@ -216,7 +218,7 @@
title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
content: $('#editDialog').html(),
success: function (layero, dIndex) {
- layDateRender();
+ layDateRender(mData);
form.val('detail', mData);
form.on('submit(editSubmit)', function (data) {
var loadIndex = layer.load(2);
@@ -236,6 +238,7 @@
}else {
layer.msg(res.msg, {icon: 2});
}
+ location.reload();
}
})
return false;
@@ -290,8 +293,9 @@
// 鏃堕棿閫夋嫨鍣�
function layDateRender() {
layDate.render({
- elem: '#modiTime\\$',
- type: 'datetime'
+ elem: '#updateTime\\$',
+ type: 'datetime',
+ value: new Date()
});
layDate.render({
elem: '#appeTime\\$',
@@ -321,7 +325,6 @@
// 鎻愬彇浜у搧
var locDetlLayerIdx;
function getLocDetl() {
-
locDetlLayerIdx = layer.open({
type: 2,
title: '璐ㄦ鏄庣粏',
@@ -332,4 +335,29 @@
success: function(layero, index){
}
});
-}
\ No newline at end of file
+}
+
+function getbillData(){
+ return billNO;
+}
+
+// function initOrderNo1() {
+// $.ajax({
+// url: baseUrl+"/work/orderNo/init1",
+// headers: {'token': localStorage.getItem('token')},
+// async: false,
+// method: 'GET',
+// success: function (res) {
+// if (res.code === 200){
+// $('#billNo').val(res.data)
+// } else if (res.code === 403){
+// top.location.href = baseUrl+"/";
+// } else {
+// notice.error({
+// title: '娑堟伅閫氱煡',
+// message: res.msg
+// });
+// }
+// }
+// });
+// }
\ No newline at end of file
diff --git a/src/main/webapp/static/js/receive/matRecQuery.js b/src/main/webapp/static/js/receive/matRecQuery.js
index 8d61224..b9ff750 100644
--- a/src/main/webapp/static/js/receive/matRecQuery.js
+++ b/src/main/webapp/static/js/receive/matRecQuery.js
@@ -68,6 +68,12 @@
});
success = false;
return false;
+ }else {
+ var nowTime = new Date();
+ var now = formatDate(nowTime);
+ form.val('inDate',{
+ "orderTime": now
+ });
}
}
var index = layer.load(1, {shade: [0.1,'#000']});
@@ -395,4 +401,13 @@
}
}
});
-}
\ No newline at end of file
+}
+
+ function formatDate(date) {
+ var y = date.getFullYear();
+ var m = date.getMonth() + 1;
+ m = m < 10 ? '0' + m : m;
+ var d = date.getDate();
+ d = d < 10 ? ('0' + d) : d;
+ return y + '-' + m + '-' + d;
+};
\ No newline at end of file
diff --git a/src/main/webapp/static/js/receiveDetl/receiveDetl.js b/src/main/webapp/static/js/receiveDetl/receiveDetl.js
index 0efd159..3665920 100644
--- a/src/main/webapp/static/js/receiveDetl/receiveDetl.js
+++ b/src/main/webapp/static/js/receiveDetl/receiveDetl.js
@@ -25,7 +25,7 @@
{type: 'checkbox'}
,{field: 'id', align: 'center',title: 'ID', hide:true}
,{field: 'hostId', align: 'center',title: '', hide:true}
- ,{field: 'orderId$', align: 'center',title: '璁㈠崟', width: 185}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', width: 185}
,{field: 'anfme', align: 'center',title: '搴斿叆搴撻噺', width: 100}
,{field: 'inQty', align: 'center',title: '宸插叆搴撻噺', width: 100}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
@@ -209,11 +209,22 @@
form.val('inDetail',{
"remain": remain
});
+
form.val('inDetail',data);
form.on('submit(inLoc)',function (data) {
-
var loc = insXmSel.getValue('valueStr');
+ var storeQty =data.field.remain;
+
+ if(storeQty> data.field.anfme - data.field.inQty || storeQty<=0){
+ layer.msg("鏁伴噺涓嶅");
+ return;
+ }
+ if(loc===""){
+ layer.msg("搴撲綅鍙蜂负绌�");
+ return;
+ }
+
$.ajax({
url: baseUrl+"/receiveDetl/addIn"
,headers: {'token':localStorage.getItem('token')}
@@ -225,6 +236,7 @@
layer.closeAll();
if(res.code === 200){
layer.msg(res.msg);
+ tableReload();
}
if (res.code === 500){
layer.msg(res.msg);
diff --git a/src/main/webapp/views/quality/quality.html b/src/main/webapp/views/quality/quality.html
index b982ff8..57d63db 100644
--- a/src/main/webapp/views/quality/quality.html
+++ b/src/main/webapp/views/quality/quality.html
@@ -17,7 +17,7 @@
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="bill_no" placeholder="妫�楠岀紪鍙�" autocomplete="off">
</div>
</div>
<!-- 寰呮坊鍔� -->
@@ -66,18 +66,6 @@
<div class="layui-row">
<div class="layui-col-md12">
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">ID: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="id" placeholder="璇疯緭鍏D" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="hostId" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
<label class="layui-form-label layui-form-required">缂栧彿: </label>
<div class="layui-input-block">
<input class="layui-input" name="uuid" placeholder="璇疯緭鍏ョ紪鍙�" lay-vertype="tips" lay-verify="required">
@@ -86,7 +74,7 @@
<div class="layui-form-item">
<label class="layui-form-label">妫�楠屽崟鍙�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="billNo" placeholder="璇疯緭鍏ユ楠屽崟鍙�">
+ <input class="layui-input" name="billNo" id="billNo" placeholder="璇疯緭鍏ユ楠屽崟鍙�" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
@@ -108,7 +96,7 @@
<div class="layui-form-item">
<label class="layui-form-label">淇敼浜哄憳: </label>
<div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="modiUser" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
+ <input class="layui-input" name="updateBy" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
<input id="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" onfocus=this.blur()>
<div class="cool-auto-complete-window">
<input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
@@ -120,32 +108,33 @@
<div class="layui-form-item">
<label class="layui-form-label">淇敼鏃堕棿: </label>
<div class="layui-input-block">
- <input class="layui-input" name="modiTime" id="modiTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+ <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍒涘缓鑰�: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="appeUser" placeholder="璇疯緭鍏ュ垱寤鸿��" style="display: none">
- <input id="appeUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ垱寤鸿��" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">娣诲姞鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="appeTime" id="appeTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">鍒涘缓鑰�: </label>-->
+<!-- <div class="layui-input-block cool-auto-complete">-->
+<!-- <input class="layui-input" name="appeUser" placeholder="璇疯緭鍏ュ垱寤鸿��" style="display: none">-->
+<!-- <input id="appeUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ垱寤鸿��" onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">娣诲姞鏃堕棿: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="appeTime" id="appeTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
<hr class="layui-bg-gray">
<div class="layui-form-item text-right">
+<!-- <button class="layui-btn layui-btn-primary" id="autoNo" onclick="initOrderNo1()">缂栧彿鑷姩鐢熸垚</button>-->
<button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
<button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
</div>
diff --git a/src/main/webapp/views/quality/waitMatoutQuery.html b/src/main/webapp/views/quality/waitMatoutQuery.html
index ccbcb6b..0fabe7f 100644
--- a/src/main/webapp/views/quality/waitMatoutQuery.html
+++ b/src/main/webapp/views/quality/waitMatoutQuery.html
@@ -195,8 +195,8 @@
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="checkQuality">妫�楠�</a>
</script>
<script>
-
var pageCurr;
+ var billNo=parent.getbillData().billNo;
function getCol() {
var cols = [
// {type: 'checkbox', fixed: 'left'},
@@ -243,6 +243,9 @@
elem: '#stockOut',
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/qualityDetl/list/auth',
+ where:{
+ bill_no:billNo
+ },
page: true,
limit: 10,
even: true,
@@ -265,6 +268,7 @@
statusCode: 200
},
done: function(res, curr, count) {
+ console.log(res.data)
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
diff --git a/src/main/webapp/views/receive/matQuery.html b/src/main/webapp/views/receive/matQuery.html
index f96ec5b..6a2f793 100644
--- a/src/main/webapp/views/receive/matQuery.html
+++ b/src/main/webapp/views/receive/matQuery.html
@@ -128,7 +128,7 @@
<script type="text/html" id="toolbar">
<div class="layui-form">
<div class="layui-btn-container">
- <!-- 2.鍚姩鍑哄簱 -->
+ <!-- 2.鍏ュ簱鍑哄簱 -->
<button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="createDoc">寮�濮嬬敓鎴�</button>
</div>
</div>
@@ -152,7 +152,7 @@
<div id="getOrderNo" style="display: none">
<!-- 璁㈠崟缂栧彿銆佸崟鎹棩鏈熴�佸崟鎹被鍨嬨�侀」鐩紪鍙枫�佸鎴风紪鍙枫�� -->
<div class="layui-form">
- <div class="layui-form-item">
+ <div id="inDate" class="layui-form-item">
<label class="layui-form-label layui-form-required">鍗曟嵁绫诲瀷:</label>
<div class="layui-input-block">
<select id="docType" name="docType" lay-verType="tips" lay-verify="required" required>
@@ -168,7 +168,7 @@
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">鍗曟嵁鏃ユ湡:</label>
<div class="layui-input-block">
- <input id="orderTime" name="orderTime" placeholder="璇疯緭鍏ュ崟鎹棩鏈�" class="layui-input icon-date" lay-verType="tips" lay-verify="required" autocomplete="off">
+ <input id="orderTime" value="2022" name="orderTime" placeholder="璇疯緭鍏ュ崟鎹棩鏈�" class="layui-input icon-date" lay-verType="tips" lay-verify="required" autocomplete="off">
</div>
</div>
<div class="layui-form-item">
diff --git a/src/main/webapp/views/receive/receive.html b/src/main/webapp/views/receive/receive.html
index c8ca6b6..afb1638 100644
--- a/src/main/webapp/views/receive/receive.html
+++ b/src/main/webapp/views/receive/receive.html
@@ -87,7 +87,7 @@
<div class="layui-inline">
<label class="layui-form-label">鍏ュ簱鍗曠紪鍙�:</label>
<div class="layui-input-inline">
- <input name="order_no" class="layui-input" placeholder="杈撳叆鍏ュ簱鍗曠紪鍙�"/>
+ <input name="order_no" class="layui-input" placeholder="鍗曟嵁缂栧彿"/>
</div>
</div>
<div class="layui-inline"> 
diff --git a/src/main/webapp/views/receiveDetl/receiveDetl.html b/src/main/webapp/views/receiveDetl/receiveDetl.html
index 8797b58..bb6e64b 100644
--- a/src/main/webapp/views/receiveDetl/receiveDetl.html
+++ b/src/main/webapp/views/receiveDetl/receiveDetl.html
@@ -18,7 +18,7 @@
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="order_no" placeholder="鍗曟嵁缂栧彿" autocomplete="off">
</div>
</div>
<!-- 寰呮坊鍔� -->
--
Gitblit v1.9.1