From 40caddc08252ad3276832a14a69cfaf9f71b08c8 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期二, 05 十一月 2024 08:53:41 +0800
Subject: [PATCH] 完善
---
zy-asrs-wms/src/main/webapp/views/mat/mat.html | 9 +
zy-asrs-wms/src/main/webapp/static/js/common.js | 4
zy-asrs-wms/src/main/webapp/static/js/mat/mat.js | 12 ++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/MobileService.java | 4
zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java | 23 ++++
zy-asrs-wms/src/main/webapp/views/index.html | 32 +++---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java | 34 ++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java | 102 ++++++++++++++++---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java | 60 +++++++++--
zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html | 7 +
11 files changed, 232 insertions(+), 57 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/MobileService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/MobileService.java
index bf93c85..ba31767 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/MobileService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/MobileService.java
@@ -18,9 +18,9 @@
*/
void adjust(MobileAdjustParam param, Long userId, Long hostId);
- R WarehouseIn(String locNo, String barcode,Long hostId);
+ R WarehouseIn(String locNo, String barcode,Long hostId,Long userId);
- R WarehouseOut(CombParam combParam, Long hostId);
+ R WarehouseOut(CombParam combParam, Long hostId,Long userId);
R WarehouseOutV1(CombParam combParam, Long hostId,Long userId);
R WarehouseOutPickMergeV1(WarehouseOutPickMergeParam param, Long hostId,Long userId);
R WarehouseOutMergeBoardMany(WarehouseOutMergeBoardManyParam param, Long hostId,Long userId);
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java
index c2d6f71..9dd70e8 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java
@@ -251,36 +251,76 @@
@Override
@Transactional
- public R WarehouseIn(String locNo, String barcode,Long hostId) {
+ public R WarehouseIn(String locNo, String barcode,Long hostId,Long userId) {
//鍒ゆ柇搴撲綅鐘舵��
LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, locNo).eq(LocMast::getHostId,hostId).eq(LocMast::getWhsType,1L));
if (Cools.isEmpty(locMast)){
return R.error("璇ュ簱浣嶄笉瀛樺湪");
}
- if (!locMast.getLocSts().equals("O")){
- return R.error("璇ュ簱浣嶇姸鎬佷负锛�"+locMast.getLocSts()+",绂佹鍏ュ簱");
- }
+// if (!locMast.getLocSts().equals("O")){
+// return R.error("璇ュ簱浣嶇姸鎬佷负锛�"+locMast.getLocSts()+",绂佹鍏ュ簱");
+// }
//鏌ヨ缁勬墭鏁版嵁
List<WaitPakin> list = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getZpallet, barcode).eq(WaitPakin::getHostId, hostId));
if (Cools.isEmpty(list)){
return R.error("鏈壘鍒扮粍鎵樹俊鎭�");
}
Date now = new Date();
+
//鎻掑叆搴撳瓨鏁版嵁
for (WaitPakin waitPakin: list){
- Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, waitPakin.getMatnr()).eq(Mat::getHostId, hostId));
- LocDetl locDetl = new LocDetl();
- locDetl.sync(mat);
- locDetl.setLocNo(locNo);
+ //澶勭悊搴撳瓨淇℃伅
+ AdjDetl adjDetl = new AdjDetl();
+ Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>()
+ .eq(Mat::getMatnr, waitPakin.getMatnr()).eq(Mat::getHostId, hostId));
+ LocDetl locDetl1=locDetlService.getOne(new LambdaQueryWrapper<LocDetl>()
+ .eq(LocDetl::getMatnr,waitPakin.getMatnr())
+ .eq(LocDetl::getHostId,hostId)
+ .eq(LocDetl::getLocNo,locNo));
+ double i=0.0;
+ if(!Cools.isEmpty(locDetl1)){
+ i=locDetl1.getAnfme();
+ locDetl1.setAnfme(locDetl1.getAnfme()+waitPakin.getAnfme());
+ locDetlService.updateById(locDetl1);
+ adjDetl.setMatnr(locDetl1.getMatnr());
+ adjDetl.setBatch(locDetl1.getBatch());
+ adjDetl.setAdjQty(locDetl1.getAnfme());
+ }else{
+ LocDetl locDetl = new LocDetl();
+ locDetl.sync(mat);
+ locDetl.setLocNo(locNo);
// locDetl.setBarcode(waitPakin.getBarcode());
- locDetl.setZpallet(waitPakin.getZpallet());
- locDetl.setAnfme(waitPakin.getAnfme());
- locDetl.setBatch(waitPakin.getBatch());
+ locDetl.setZpallet(waitPakin.getZpallet());
+ locDetl.setAnfme(waitPakin.getAnfme());
+ locDetl.setBatch(waitPakin.getBatch());
// locDetl.setWeight(waitPakin.getWeight());
- locDetl.setHostId(hostId);
- locDetl.setModiTime(now);
- locDetl.setAppeTime(now);
- locDetlService.save(locDetl);
+ locDetl.setHostId(hostId);
+ locDetl.setModiTime(now);
+ locDetl.setAppeTime(now);
+ locDetlService.save(locDetl);
+ adjDetl.setMatnr(locDetl.getMatnr());
+ adjDetl.setBatch(locDetl.getBatch());
+ adjDetl.setAdjQty(locDetl.getAnfme());
+ }
+
+ try {
+
+ adjDetl.setLocNo(locNo);
+ adjDetl.setOriQty(i);
+ adjDetl.setMemo("骞冲韩涓婃灦");
+ adjDetl.setModiUser(userId);
+ adjDetl.setAppeUser(userId);
+ adjDetl.setAppeTime(new Date());
+ adjDetl.setModiTime(new Date());
+ adjDetl.setOrderNo(waitPakin.getOrderNo());
+ if (!adjDetlService.save(adjDetl)) {
+ throw new CoolException("淇濆瓨搴撳瓨璋冩暣璁板綍澶辫触");
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ throw new CoolException("鏇存柊搴撳瓨鏁版嵁鍑洪敊" + e.getMessage());
+ }
+
//鏄惁灞炰簬璁㈠崟鏁版嵁
if (!Cools.isEmpty(waitPakin.getOrderNo())){
Order order = orderService.selectByNo(waitPakin.getOrderNo(), hostId);
@@ -320,7 +360,7 @@
@Override
@Transactional
- public R WarehouseOut(CombParam combParam, Long hostId) {
+ public R WarehouseOut(CombParam combParam, Long hostId , Long userId) {
//鍒ゆ柇搴撲綅鐘舵��
LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, combParam.getLocno()).eq(LocMast::getHostId,hostId).eq(LocMast::getWhsType,1L));
if (Cools.isEmpty(locMast)){
@@ -371,6 +411,8 @@
orderService.checkComplete(combParam.getOrderNo(), hostId);
}
try {
+ double i=0.0;
+ double j=locDetl.getAnfme();
//澶勭悊搴撳瓨淇℃伅
if (combMat.getAnfme().equals(locDetl.getAnfme())){
//搴撳瓨鐩哥瓑鍒犻櫎鏁版嵁
@@ -383,8 +425,32 @@
}
}else {
BigDecimal subtract = BigDecimal.valueOf(locDetl.getAnfme()).subtract(BigDecimal.valueOf(combMat.getAnfme()));
+ i=subtract.byteValue();
locDetl.setAnfme(subtract.doubleValue());
locDetlService.updateById(locDetl);
+ }
+
+ try {
+ //澶勭悊搴撳瓨淇℃伅
+ AdjDetl adjDetl = new AdjDetl();
+ adjDetl.setLocNo(locDetl.getLocNo());
+ adjDetl.setMatnr(locDetl.getMatnr());
+ adjDetl.setBatch(locDetl.getBatch());
+ adjDetl.setOriQty(j);
+ adjDetl.setAdjQty(i);
+ adjDetl.setMemo("骞冲韩涓嬫灦");
+ adjDetl.setModiUser(userId);
+ adjDetl.setAppeUser(userId);
+ adjDetl.setAppeTime(new Date());
+ adjDetl.setModiTime(new Date());
+ adjDetl.setOrderNo(combParam.getOrderNo());
+ adjDetl.setHostId(hostId);
+ if (!adjDetlService.save(adjDetl)) {
+ throw new CoolException("淇濆瓨搴撳瓨璋冩暣璁板綍澶辫触");
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ throw new CoolException("鏇存柊搴撳瓨鏁版嵁鍑洪敊" + e.getMessage());
}
}catch (Exception e){
throw new CoolException("鏇存柊搴撳瓨鏁版嵁鍑洪敊"+e.getMessage());
@@ -461,7 +527,7 @@
adjDetl.setMatnr(locDetl.getMatnr());
adjDetl.setBatch(locDetl.getBatch());
adjDetl.setOriQty(locDetl.getAnfme());
- adjDetl.setMemo("WarehouseOutV1-pick");
+ adjDetl.setMemo("骞舵澘閫斾腑鎷ｆ枡");
adjDetl.setModiUser(userId);
adjDetl.setAppeUser(userId);
adjDetl.setAppeTime(new Date());
@@ -637,7 +703,7 @@
adjDetl.setBatch(locDetl.getBatch());
adjDetl.setOriQty(originAnfme);
adjDetl.setAdjQty(locDetl.getAnfme());
- adjDetl.setMemo("WarehouseOutV1-pick");
+ adjDetl.setMemo("鎷ｆ枡閫斾腑骞舵澘");
adjDetl.setModiUser(userId);
adjDetl.setAppeUser(userId);
adjDetl.setAppeTime(new Date());
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml
index 36b1b7d..b36753b 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml
@@ -73,6 +73,7 @@
</if>
and b.host_id = #{hostId}
and b.loc_sts = 'F'
+ and b.row1 in (1,2,3,4)
order by b.row1
</select>
@@ -114,6 +115,7 @@
where 1=1
and b.loc_sts = 'F'
and b.host_id = #{map.hostId}
+ and b.row1 in (1,2,3,4)
<include refid="stockOutCondition"></include>
</select>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
index e85fac5..32772ee 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
@@ -299,20 +299,56 @@
@RequestMapping(value = "/stock/out/list/auth")
@ManagerAuth
- public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- if (!Cools.isEmpty(param.get("modi_time"))){
- String val = String.valueOf(param.get("modi_time"));
- if (val.contains(RANGE_TIME_LINK)) {
- String[] dates = val.split(RANGE_TIME_LINK);
- param.put("startTime", DateUtils.convert(dates[0]));
- param.put("endTime", DateUtils.convert(dates[1]));
- param.remove("modi_time");
+ public R stockOutList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam(required = false) String timeRange,
+ @RequestParam Map<String, Object> param) {
+ QueryWrapper<LocDetl> wrapper = new QueryWrapper<>();
+
+ if (!Cools.isEmpty(param.get("decrees"))) {
+ ArrayList<String> mats = new ArrayList<>();
+ List<Mat> decrees = matService.list(new LambdaQueryWrapper<Mat>().like(Mat::getDecrees, param.get("decrees")));
+ if (decrees.isEmpty()) {
+ mats.add("-1");
+ }else {
+ for (Mat mat : decrees) {
+ mats.add(mat.getMatnr());
+ }
}
+ wrapper.in("matnr", mats);
+ param.remove("decrees");
}
- param.put("hostId", getHostId());
- return R.ok(locDetlService.getStockOut(curr, limit, param));
+
+ convert(param,wrapper);
+ wrapper.eq("host_id", getHostId());
+// if (!Cools.isEmpty(condition)) {
+// wrapper.like(LocDetl::getLocNo, condition);
+// }
+ if (!Cools.isEmpty(timeRange)) {
+ String[] range = timeRange.split(RANGE_TIME_LINK);
+ wrapper.ge("appe_time", DateUtils.convert(range[0]));
+ wrapper.le("appe_time", DateUtils.convert(range[1]));
+ }
+ if (!Cools.isEmpty(param.get("locNo"))) {
+ wrapper.like("loc_no", param.get("locNo"));
+ }
+
+ if (!Cools.isEmpty(param.get("zpallet"))) {
+ wrapper.like("zpallet", param.get("zpallet"));
+ }
+
+ if (!Cools.isEmpty(orderByField)){
+ wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));
+ }
+
+ param.remove("locNo");
+ param.remove("owner");
+ param.remove("matnr");
+ allLike(LocDetl.class, param.keySet(), wrapper, condition);
+ return R.ok(locDetlService.page(new Page<>(curr, limit), wrapper));
}
@RequestMapping(value = "/locDetl/statis/export")
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
index d3ac1d2..ac291c0 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
@@ -5,13 +5,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.utils.TreeUtils;
-import com.zy.asrs.common.wms.entity.LocDetl;
-import com.zy.asrs.common.wms.entity.LocMast;
-import com.zy.asrs.common.wms.entity.Mat;
-import com.zy.asrs.common.wms.entity.OrderDetl;
+import com.zy.asrs.common.wms.entity.*;
import com.zy.asrs.common.wms.service.LocDetlService;
import com.zy.asrs.common.wms.service.LocMastService;
import com.zy.asrs.common.wms.service.MatService;
+import com.zy.asrs.common.wms.service.WrkMastService;
import com.zy.asrs.framework.annotations.ManagerAuth;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
@@ -35,6 +33,8 @@
private LocDetlService locDetlService;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private WrkMastService wrkMastService;
@RequestMapping(value = "/mat/{id}/auth")
@ManagerAuth
@@ -242,4 +242,30 @@
return R.ok(locDetls);
}
+ @GetMapping("/mat/synchronous")
+ @ManagerAuth
+ public R synchronous(){
+ int wrkConut=wrkMastService.count(new LambdaQueryWrapper<WrkMast>());
+ if(wrkConut>0){
+ return R.error("鏈夊伐浣滀腑鐨勪换鍕欙紝绂佹鍚屾搴撳瓨淇℃伅");
+ }
+ List<Mat> mats=matService.list();
+ for (Mat mat:mats
+ ) {
+ List<LocDetl>locDetls=locDetlService.list(new LambdaQueryWrapper<LocDetl>()
+ .eq(LocDetl::getMatnr,mat.getMatnr()));
+ for (LocDetl locDetl:locDetls
+ ) {
+ locDetl.setMaktx(mat.getMaktx());
+ locDetl.setSpecs(mat.getSpecs());
+ locDetl.setModel(mat.getModel());
+ locDetl.setSku(mat.getSku());
+ locDetl.setItemNum(mat.getImgNum());//鍥惧彿
+ locDetl.setWeight(Double.parseDouble(mat.getWeight()));
+ locDetl.setLength(Double.parseDouble(mat.getLength()));
+ locDetlService.updateById(locDetl);
+ }
+ }
+ return R.ok();
+ }
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
index 9d45c2a..a84fb60 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
@@ -66,16 +66,28 @@
@Autowired
private MatService matService;
+
+ /**
+ * 骞冲韩涓婃灦
+ * @param locNo
+ * @param barcode
+ * @return
+ */
@RequestMapping("/pda/WarehouseIn")
@ManagerAuth
public R WarehouseIn(@RequestParam String locNo, @RequestParam String barcode) {
- return mobileService.WarehouseIn(locNo, barcode, getHostId());
+ return mobileService.WarehouseIn(locNo, barcode, getHostId(), getUserId());
}
+ /**
+ * 骞冲韩涓嬫灦
+ * @param combParam
+ * @return
+ */
@RequestMapping("/pda/WarehouseOut")
@ManagerAuth
public R WarehouseOut(@RequestBody CombParam combParam) {
- return mobileService.WarehouseOut(combParam, getHostId());
+ return mobileService.WarehouseOut(combParam, getHostId(), getUserId());
}
@RequestMapping("/outBound/mat/list")
@@ -520,7 +532,7 @@
return R.ok().add(maps);
}
- @RequestMapping("/outBound/mat/list")
+ @RequestMapping("/outBound/order/list")
@ManagerAuth(memo = "鑾峰彇鍑哄簱璁㈠崟")
public R outBound(@RequestParam(required = false) String matnr,@RequestParam(required = false) String orderNo){
List<DocType> docTypes = docTypeService.list(new LambdaQueryWrapper<DocType>().like(DocType::getPakout, 1));
@@ -671,8 +683,13 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
+ Order order = orderService.selectByNo(matParam.getOrderNo(), getHostId());
+ if (order == null) {
+ throw new CoolException("Order is not exits");
+ }
//鏇存柊璁㈠崟宸ヤ綔鏁伴噺
orderDetlService.increaseWorkQtyByOrderNo(matParam.getOrderNo(), matParam.getMatnr(), matParam.getBatch(), matParam.getUseCount(), getHostId());
+ orderService.updateSettle(order.getId(), 2L, getUserId(), getHostId());
}
// 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, param.getLocNo()).eq(LocMast::getHostId, getHostId()));
diff --git a/zy-asrs-wms/src/main/webapp/static/js/common.js b/zy-asrs-wms/src/main/webapp/static/js/common.js
index d797ca9..2345d36 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/common.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/common.js
@@ -204,7 +204,7 @@
, {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: 'sku', align: 'center', title: '淇楃О', hide: false}
, {field: 'units', align: 'center', title: '鍗曚綅閲�', hide: true}
, {field: 'barcode', align: 'center', title: '鎵樼洏鐮�', hide: true}
, {field: 'origin', align: 'center', title: '浜у湴', hide: true}
@@ -260,7 +260,7 @@
, {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: 'sku', align: 'center', title: '淇楃О', hide: false}
, {field: 'units', align: 'center', title: '鍗曚綅閲�', hide: true}
, {field: 'barcode', align: 'center', title: '鎵樼洏鐮�', hide: true}
, {field: 'origin', align: 'center', title: '浜у湴', hide: true}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/mat/mat.js b/zy-asrs-wms/src/main/webapp/static/js/mat/mat.js
index 2d105b1..b4cd9eb 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/mat/mat.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/mat/mat.js
@@ -364,6 +364,18 @@
tableReload(false);
});
+ // 鍚屾搴瓨
+ form.on('submit(synchronous)', function (data) {
+ layer.confirm('纭鍚屾搴瓨锛�', function(){
+ http.get(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:1}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg);
+ })
+ layer.closeAll();
+
+ });
+ });
+
// 鏃堕棿閫夋嫨鍣�
layDate.render({
elem: '#createTime\\$',
diff --git a/zy-asrs-wms/src/main/webapp/views/index.html b/zy-asrs-wms/src/main/webapp/views/index.html
index fff8290..0d8647b 100644
--- a/zy-asrs-wms/src/main/webapp/views/index.html
+++ b/zy-asrs-wms/src/main/webapp/views/index.html
@@ -169,22 +169,22 @@
}
});
- $.ajax({
- url: baseUrl + "/license/getLicenseDays",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code == 200) {
- let days = res.data
- if (days <= 30) {
- $("#licenseShow").show()
- $("#licenseDays").html(days)
- }
- }else {
- top.location.href = baseUrl + "/login";
- }
- }
- });
+ // $.ajax({
+ // url: baseUrl + "/license/getLicenseDays",
+ // headers: {'token': localStorage.getItem('token')},
+ // method: 'POST',
+ // success: function (res) {
+ // if (res.code == 200) {
+ // let days = res.data
+ // if (days <= 30) {
+ // $("#licenseShow").show()
+ // $("#licenseDays").html(days)
+ // }
+ // }else {
+ // top.location.href = baseUrl + "/login";
+ // }
+ // }
+ // });
// 榛樿鍔犺浇涓婚〉
index.loadHome({
diff --git a/zy-asrs-wms/src/main/webapp/views/mat/mat.html b/zy-asrs-wms/src/main/webapp/views/mat/mat.html
index d45dcd8..13c27ec 100644
--- a/zy-asrs-wms/src/main/webapp/views/mat/mat.html
+++ b/zy-asrs-wms/src/main/webapp/views/mat/mat.html
@@ -117,6 +117,9 @@
<button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
<i class="layui-icon"></i>閲嶇疆
</button>
+ <button class="layui-btn icon-btn" lay-filter="synchronous" lay-submit>
+ <i class="layui-icon"></i>鍚屾搴瓨
+ </button>
</div>
</div>
<table class="layui-hide" id="mat" lay-filter="mat"></table>
@@ -276,6 +279,12 @@
<input name="height" placeholder="楂樺害" class="layui-input">
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇楃О</label>
+ <div class="layui-input-block">
+ <input name="sku" placeholder="淇楃О" class="layui-input">
+ </div>
+ </div>
</div>
</div>
diff --git a/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html b/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html
index f5b44ef..db1e89c 100644
--- a/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -92,6 +92,13 @@
<input class="layui-input" type="text" name="owner" 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>
<!-- 寰呮坊鍔� -->
<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>
--
Gitblit v1.9.1