From 8bc35cc4f75cfb435577e34763002f69def6a1a2 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期六, 07 二月 2026 16:53:18 +0800
Subject: [PATCH] 调试
---
src/main/java/com/zy/asrs/service/WorkService.java | 2
src/main/webapp/views/locDetl/locDetl.html | 3
src/main/webapp/views/pda/index.html | 2
src/main/java/com/zy/asrs/controller/LocMastController.java | 39 +
src/main/java/com/zy/asrs/service/LocDetlService.java | 2
src/main/webapp/static/js/locDetlStatis/locDetlStatis.js | 2
src/main/resources/mapper/LocDetlMapper.xml | 11
src/main/resources/mapper/LocMastMapper.xml | 8
src/main/webapp/views/pakStore/clampOut_old.html | 132 ++++++
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 40 +
src/main/webapp/views/pakStore/clampOut.html | 154 ++++---
src/main/webapp/static/js/pakStore/clampOut.js | 251 +++++++----
src/main/java/com/zy/common/web/WcsController.java | 1
src/main/java/com/zy/asrs/controller/WorkController.java | 2
src/main/webapp/static/js/locDetl/locDetl.js | 231 ++++++----
src/main/webapp/views/pakStore/clampDetlQuery_old.html | 0
src/main/webapp/static/js/pakStore/clampOut_old.js | 138 ++++++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 170 ++-----
src/main/webapp/static/js/adjDetl/adjDetl.js | 2
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 31 +
src/main/java/com/zy/common/service/CommonService.java | 10
21 files changed, 838 insertions(+), 393 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index ae04df8..a6d80f3 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -24,7 +24,9 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.Size;
+import java.math.BigDecimal;
import java.util.*;
+import java.util.stream.Collectors;
@RestController
public class LocMastController extends BaseController {
@@ -117,6 +119,7 @@
locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
}
}
+ locMast.setBarcode("");
locMast.setModiUser(getUserId());
locMast.setModiTime(new Date());
locMastService.updateById(locMast);
@@ -238,6 +241,40 @@
return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
}
+ @RequestMapping(value = "/locMast/list/auth/lev/clamp")
+ @ManagerAuth
+ public R listLevClamp(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ excludeTrash(param);
+ EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
+ convertLev(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ Page<LocMast> pageResult = locMastService.selectPage(new Page<>(curr, limit), wrapper);
+ if (pageResult != null && pageResult.getRecords() != null && !pageResult.getRecords().isEmpty()) {
+ // 鑾峰彇鎵�鏈塴oc_no
+ List<String> locNos = pageResult.getRecords().stream()
+ .map(LocMast::getLocNo) // 鍋囪鏈塯etLocNo鏂规硶
+ .filter(Objects::nonNull)
+ .distinct()
+ .collect(Collectors.toList());
+ if (!Cools.isEmpty(locNos)) {
+ Map<String, Double> anfmeMap = locDetlService.getAnfmeByLocNos(locNos);
+ // 鏇存柊sc_weight瀛楁
+ for (LocMast locMast : pageResult.getRecords()) {
+ if (locMast.getLocNo() != null && anfmeMap.containsKey(locMast.getLocNo())) {
+ locMast.setScWeight(anfmeMap.get(locMast.getLocNo())); // 鍋囪鏈塻etScWeight鏂规硶
+ } else {
+ locMast.setScWeight(0.0); // 濡傛灉娌℃湁瀵瑰簲鏁版嵁锛岃涓�0鎴杗ull
+ }
+ }
+ }
+ }
+ return R.ok(pageResult);
+ }
+
private <T> void convertLev(Map<String, Object> map, EntityWrapper<T> wrapper){
String sizeValue = null;
@@ -275,7 +312,7 @@
// 绗笁姝ワ細濡傛灉娌℃湁size鍙傛暟锛屽垯娣诲姞榛樿鏉′欢
if (sizeValue == null) {
- wrapper.eq("loc_sts", "D");
+ wrapper.eq("loc_sts", map.get("loc_sts"));
} else {
// 濡傛灉鏈塻ize鍙傛暟锛屾坊鍔爈oc_sts != 'Y'鐨勬潯浠�
wrapper.and().ne("loc_sts", "Y");
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index ba728eb..371b628 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -307,7 +307,7 @@
//骞舵澘鍑哄簱
@RequestMapping("/locClamp/out/start")
@ManagerAuth(memo = "骞舵澘鍑哄簱")
- public R locClampOutStart(@RequestBody StockOutParam param) {
+ public R locClampOutStart(EmptyPlateOutParam param) {
workService.locClampOut(param, getUserId());
return R.ok("鍑哄簱鍚姩鎴愬姛");
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 05a0914..81d25c3 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -89,4 +89,6 @@
List<Map<String, Object>> selectLocDetlUnilateralMoveShuttleMap(Integer crnNo);
List<LocDetl> selectLocDetlUnilateralMoveShuttle(String matnr, String batch, String grade, Integer crnNo);
+
+ Map<String, Double> getAnfmeByLocNos(List<String> locNos);
}
diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index d7f2dbc..2ca8e91 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -111,5 +111,5 @@
void turnMatLocDetl(EmptyPlateOutParam param, Long userId);
- void locClampOut(StockOutParam param, Long userId);
+ void locClampOut(EmptyPlateOutParam param, Long userId);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 62d2529..ed03412 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -1,5 +1,6 @@
package com.zy.asrs.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.LocDetl;
@@ -14,9 +15,8 @@
import com.zy.asrs.utils.MatCompareUtils;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
@Service("locDetlService")
public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
@@ -211,6 +211,40 @@
}
@Override
+ public Map<String, Double> getAnfmeByLocNos(List<String> locNos) {
+ if (locNos == null || locNos.isEmpty()) {
+ return new HashMap<>();
+ }
+
+ // 鏋勫缓鏌ヨ鏉′欢
+ EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
+ wrapper.in("loc_no", locNos);
+
+ // 鎵ц鏌ヨ
+ List<LocDetl> list = this.selectList(wrapper);
+
+ // 鎸塴oc_no鍒嗙粍骞剁疮鍔燼nfme鍊�
+ Map<String, Double> resultMap = new HashMap<>();
+ for (LocDetl item : list) {
+ if (item.getLocNo() != null && item.getAnfme() != null) {
+ String locNo = item.getLocNo();
+ Double anfmeValue = item.getAnfme();
+
+ if (resultMap.containsKey(locNo)) {
+ // 绱姞宸插瓨鍦ㄧ殑鍊�
+ Double sum = resultMap.get(locNo) + anfmeValue;
+ resultMap.put(locNo, sum);
+ } else {
+ // 绗竴娆℃坊鍔�
+ resultMap.put(locNo, anfmeValue);
+ }
+ }
+ }
+
+ return resultMap;
+ }
+
+ @Override
public LocDetl selectItem(String locNo, WrkDetl wrkDetl) {
List<LocDetl> locDetls = this.baseMapper.selectItem3(locNo, wrkDetl.getMatnr());
if (locDetls != null) {
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 25a3c13..2561c9b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -94,10 +94,17 @@
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
+ int countLocMast = locMastService.selectCount(new EntityWrapper<LocMast>().eq("barcode", param.getBarcode()));
if (countLoc > 0 || countWrk > 0 || countwait > 0) {
throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
}
-
+ if (wrkMast != null && wrkMast.getWrkSts() != 15){
+ throw new CoolException("宸ヤ綔妗ｈ繕鏈畬鎴�,鎵樼洏杩樻湭鍑哄簱" + param.getBarcode());
+ }
+ if (countLocMast > 0){
+ throw new CoolException("鎵樼洏鏈嚭搴�");
+ }
Date now = new Date();
// 鏃犲崟缁勬墭
@@ -656,6 +663,7 @@
adjDetl.setLocNo(wrkMast.getSourceLocNo()); // 搴撲綅
adjDetl.setBarcode( param.getBarcode()); // 鎵樼洏鐮�
adjDetl.setWorkNo(wrkMast.getWrkNo().toString()); //骞舵澘瀵瑰簲鐨勫伐浣滃彿
+ adjDetl.setMemo("骞舵澘");
for (CombParam.CombMat wrkDetl : combMats) {
WrkDetl wrkDetlOld = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
@@ -721,6 +729,15 @@
List<CombParam.CombMat> combMats = combParam.getCombMats();
String recordRecordLog = "鎵樼洏鐮�" + combParam.getBarcode() + "鐩樼偣璁板綍锛�";
+ AdjDetl adjDetl = new AdjDetl();
+ adjDetl.setAppeTime(new Date());
+ adjDetl.setAppeUser(userId);
+ adjDetl.setModiTime(new Date());
+ adjDetl.setModiUser(userId);
+ adjDetl.setLocNo(wrkMast.getSourceLocNo()); // 搴撲綅
+ adjDetl.setBarcode(combParam.getBarcode()); // 鎵樼洏鐮�
+ adjDetl.setWorkNo(wrkMast.getWrkNo().toString()); //鐩樼偣瀵瑰簲鐨勫伐浣滃彿
+ adjDetl.setMemo("鐩樼偣");
for (CombParam.CombMat wrkDetl : combMats) {
WrkDetl wrkDetlOld = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
@@ -728,6 +745,10 @@
.eq("matnr", wrkDetl.getMatnr())
// .eq("batch",Cools.isEmpty(wrkDetl.getBatch())?"":wrkDetl.getBatch())
);
+
+ adjDetl.setMatnr(wrkDetl.getMatnr());
+ adjDetl.setBatch(wrkDetl.getBatch());
+ adjDetl.setAdjQty(wrkDetl.getAnfme()); //鍙樻洿鏁伴噺
if (Cools.isEmpty(wrkDetlOld)) {
WrkDetl detl = new WrkDetl();
@@ -739,17 +760,25 @@
detl.setModiUser(userId); // 淇敼浜哄憳
detl.setAppeUser(userId); // 娣诲姞浜哄憳
wrkDetlService.insert(detl); // 鎻掑叆宸ヤ綔鏄庣粏
+
+ adjDetl.setOriQty(0.0); // 鍘熸暟閲�
+ adjDetlService.insert(adjDetl);
+
recordRecordLog = recordRecordLog + "\n" + "鏂板涓�鏉℃槑缁�:" + "\t鍟嗗搧缂栧彿锛�" + wrkDetl.getMatnr() + "\t鎵瑰彿锛�" + wrkDetl.getBatch() + "\t鏁伴噺锛�" + wrkDetl.getAnfme();
}
// 鏇存柊鏁伴噺
else if (!wrkDetlOld.getAnfme().equals(wrkDetl.getAnfme())) {
wrkDetlService.updateInventoryAnfme(wrkDetl.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+ adjDetl.setOriQty(wrkDetlOld.getAnfme()); // 鍘熸暟閲�
+ adjDetlService.insert(adjDetl);
recordRecordLog = recordRecordLog + "\n" + "鏇存柊涓�鏉℃槑缁�:" + "\t鍟嗗搧缂栧彿锛�" + wrkDetl.getMatnr() + "\t鎵瑰彿锛�" + wrkDetl.getBatch() + "\t鍘熸暟閲忥細" + wrkDetlOld.getAnfme() + "\t鏇存柊鏁伴噺锛�" + wrkDetl.getAnfme();
}
// 鏁伴噺淇濇寔涓嶅彉
else if (wrkDetlOld.getAnfme().equals(wrkDetl.getAnfme())) {
+ adjDetl.setOriQty(wrkDetlOld.getAnfme()); // 鍘熸暟閲�
+ adjDetlService.insert(adjDetl);
recordRecordLog = recordRecordLog + "\n" + "涓�鏉℃槑缁嗕繚鎸佷笉鍙�:" + "\t鍟嗗搧缂栧彿锛�" + wrkDetl.getMatnr() + "\t鎵瑰彿锛�" + wrkDetl.getBatch() + "\t鏁伴噺锛�" + wrkDetlOld.getAnfme();
continue;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 2a4feee..eb961e5 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -931,7 +931,7 @@
String locNo = ""; // 寰呬慨鏀圭洰鏍囧簱浣�
String locSts = ""; // 寰呬慨鏀圭洰鏍囧簱浣嶇姸鎬�
// 鍏ュ簱鍙栨秷锛堜慨鏀圭洰鏍囧簱浣嶏級
- if (wrkMast.getWrkSts() < 4 || (wrkMast.getWrkSts()>= 103 && wrkMast.getWrkSts() <= 105)) {
+ if (wrkMast.getWrkSts() < 4) {
locNo = wrkMast.getLocNo();
locSts = "O";
@@ -940,15 +940,15 @@
// 搴撲綅杞Щ锛氭簮搴撲綅
LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
if (Cools.isEmpty(locMast)) {
- throw new CoolException("鍙栨秷搴撲綅杞Щ澶辫触锛屾簮搴撲綅涓嶅瓨鍦�:" + wrkMast.getSourceLocNo());
+ throw new CoolException("鍙栨秷搴撲綅杞Щ澶辫触锛屾簮搴撲綅涓嶅瓨鍦�:"+ wrkMast.getSourceLocNo());
}
- locMast.setLocSts(wrkMast.getFullPlt().equalsIgnoreCase("N") ? "D" : "F");
+ locMast.setLocSts(wrkMast.getFullPlt().equalsIgnoreCase("N")?"D":"F");
locMast.setModiTime(now);
locMast.setModiUser(userId);
locMastService.updateById(locMast);
}
// 鍑哄簱鍙栨秷锛堜慨鏀规簮搴撲綅锛�
- } else if ((wrkMast.getWrkSts() > 10 && wrkMast.getWrkSts() != 14)) {
+ } else if (wrkMast.getWrkSts() > 10 && wrkMast.getWrkSts() != 14) {
locNo = wrkMast.getSourceLocNo();
// 鍑哄簱 ===>> F.鍦ㄥ簱
if (wrkMast.getIoType() > 100 && wrkMast.getIoType() != 110) {
@@ -958,11 +958,11 @@
locSts = "D";
// 搴撲綅杞Щ ===>> D.绌烘《/绌烘爤鏉�
} else if (wrkMast.getIoType() == 11) {
- locSts = wrkMast.getFullPlt().equalsIgnoreCase("N") ? "D" : "F";
+ locSts = wrkMast.getFullPlt().equalsIgnoreCase("N")?"D":"F";
// 搴撲綅杞Щ锛氱洰鏍囧簱浣�
LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
if (Cools.isEmpty(locMast)) {
- throw new CoolException("鍙栨秷搴撲綅杞Щ澶辫触锛岀洰鏍囧簱浣嶄笉瀛樺湪:" + wrkMast.getSourceLocNo());
+ throw new CoolException("鍙栨秷搴撲綅杞Щ澶辫触锛岀洰鏍囧簱浣嶄笉瀛樺湪:"+ wrkMast.getSourceLocNo());
}
locMast.setLocSts("O");
locMast.setModiTime(now);
@@ -1063,6 +1063,7 @@
throw new CoolException("鍙栨秷宸ヤ綔妗ｅけ璐ワ紝搴撲綅涓嶅瓨鍦�:" + locNo);
}
locMast.setLocSts(locSts);
+// locMast.setScWeight(0.0); // 鍏ュ簱鍙栨秷 鎶婃爤鏉块噸閲忕疆涓�0
locMast.setModiTime(now);
locMast.setModiUser(userId);
boolean locMastRes = locMastService.updateById(locMast);
@@ -1261,120 +1262,69 @@
}
@Override
- public void locClampOut(StockOutParam param, Long userId) {
+ public void locClampOut(EmptyPlateOutParam param, Long userId) {
// 鐩爣绔欑偣鐘舵�佹娴�
BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
// 鑾峰彇搴撲綅鏄庣粏
- List<LocDetlDto> locDetlDtos = new ArrayList<>();
- for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
- if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
- LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl);
- if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
- }
- }
- if (!locDetlDtos.isEmpty()) {
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
- if (locMast.getLocSts().equals("F")) {
- // 鍚姩鍑哄簱寮�濮� 107.鐩樼偣鍑哄簱
- clampOut(staNo, locDetlDtos, IoWorkType.CHECK_OUT, userId);
- } else {
- throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篎鐨勫簱浣嶏紝搴撲綅鍙凤細" + locMast.getLocNo() + " 銆佸綋鍓嶇姸鎬侊細" + locMast.getLocSts() + "-" + locMast.getLocSts$());
- }
- } else {
- throw new CoolException("搴撲綅鐗╂枡涓嶅瓨鍦�");
+ for (String locNo : param.getLocNos()) {
+ List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
+ clampout(locDetlList,locNo,staNo,IoWorkType.CHECK_OUT,userId);
}
}
-
@Transactional
- public void clampOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId) {
+ public void clampout(List<LocDetl> locDetlList,String locNo,BasDevp staNo,IoWorkType ioWorkType,Long userId) {
Date now = new Date();
- // 鍚堝苟鍚岀被椤�
- Set<String> locNos = new HashSet<>();
- List<OutLocDto> dtos = new ArrayList<>();
- for (LocDetlDto locDetlDto : locDetlDtos) {
- String locNo = locDetlDto.getLocDetl().getLocNo();
- if (locNos.contains(locNo)) {
- for (OutLocDto dto : dtos) {
- if (dto.getLocNo().equals(locNo)) {
- dto.getLocDetlDtos().add(locDetlDto);
- break;
- }
- }
- } else {
- locNos.add(locNo);
- dtos.add(new OutLocDto(locNo, locDetlDto));
+ // 鑾峰彇璺緞
+ Integer outSta = staNo.getDevNo();
+ LocMast locMast = locMastService.selectById(locNo);
+ StaDesc staDesc = staDescService.queryCrnStn(104, locMast.getCrnNo(), outSta);
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(104));
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+ wrkMast.setIoType(104); // 鍏ュ嚭搴撶姸鎬�
+ wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast.setCrnNo(locMast.getCrnNo());
+ wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
+ wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
+ wrkMast.setSourceLocNo(locNo); // 婧愬簱浣�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("N");
+ wrkMast.setBarcode(locMast.getBarcode());
+ wrkMast.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiUser(userId);
+ wrkMast.setModiTime(now);
+ if (!wrkMastService.insert(wrkMast)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + locNo);
+ }
+ // 鐢熸垚宸ヤ綔鏄庣粏
+ for (LocDetl locDetl : locDetlList) {
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(locDetl);
+ wrkDetl.setWrkNo(workNo);
+ wrkDetl.setIoTime(now);
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setAppeUser(userId);
+ wrkDetl.setModiTime(now);
+ wrkDetl.setModiUser(userId);
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
}
- Integer ioType = null;
- // 鐢熸垚宸ヤ綔妗�
- for (OutLocDto dto : dtos) {
- ioType = 104;
- assert ioType != null;
- // 鑾峰彇搴撲綅
- LocMast locMast = locMastService.selectById(dto.getLocNo());
-
- Integer outSta = staNo.getDevNo();
- // 鑾峰彇璺緞
- StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
- // 鐢熸垚宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
- // 鐢熸垚宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(now);
- wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
- wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
- wrkMast.setIoPri(13D); // 浼樺厛绾э細13
- wrkMast.setCrnNo(locMast.getCrnNo());
- wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
- wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
- wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣�
- wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("N"); // 绌烘澘
- wrkMast.setLinkMis("N");
- wrkMast.setBarcode(locMast.getBarcode());
- wrkMast.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
- wrkMast.setAppeTime(now);
- wrkMast.setModiUser(userId);
- wrkMast.setModiTime(now);
- if (!wrkMastService.insert(wrkMast)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + dto.getLocNo());
- }
- // 鐢熸垚宸ヤ綔妗ｆ槑缁�
- for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
- if (detlDto.getCount() == null || detlDto.getCount() <= 0.0D) {
- continue;
- }
- WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.sync(detlDto.getLocDetl());
- wrkDetl.setOrderNo(""); // 鎵嬪姩鍑哄簱涓嶉渶瑕佸甫鍑哄簱瀛樹腑鐨勫崟鎹紪鍙�
- wrkDetl.setWrkNo(workNo);
- wrkDetl.setIoTime(now);
- Double anfme = ioType == 101 ? detlDto.getLocDetl().getAnfme() : detlDto.getCount();
- wrkDetl.setAnfme(anfme); // 鏁伴噺
- wrkDetl.setAppeTime(now);
- wrkDetl.setAppeUser(userId);
- wrkDetl.setModiTime(now);
- wrkDetl.setModiUser(userId);
- if (!wrkDetlService.insert(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
- }
- }
- // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
- locMast = locMastService.selectById(dto.getLocNo());
- if (locMast.getLocSts().equals("F")) {
- locMast.setLocSts(ioType == 101 ? "R" : "P");
- locMast.setModiUser(userId);
- locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)) {
- throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細" + dto.getLocNo());
- }
- } else {
- throw new CoolException(dto.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
- }
+ // 淇敼搴撲綅鐘舵��
+ locMast.setLocSts("P");
+ locMast.setModiTime(now);
+ locMast.setModiUser(userId);
+ if (!locMastService.updateById(locMast)){
+ throw new CoolException("骞舵澘鍑哄簱淇敼搴撲綅鐘舵�佸け璐�");
}
}
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index e747d08..a3877bf 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -448,9 +448,13 @@
public StartupDto getLocNoToTwo(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
//鐩爣搴撲綅
LocMast locMast = null;
- if (locTypeDto.getLocType2()==5 || locTypeDto.getLocType2() == 6){
- //1鍙峰贩閬�
- locMast=locMastService.queryLocToOneEmpty(locTypeDto.getLocType2());
+ if (locTypeDto.getLocType2()==5){
+ //1鍙峰贩閬� 鍗曠嫭鐨勬墭鐩�
+ locMast=locMastService.queryLocToOne(locTypeDto.getLocType2());
+
+ }else if (locTypeDto.getLocType2() == 6){
+ //1鍙峰贩閬� 娣风敤鎵樼洏
+ locMast=locMastService.queryLocToSpecal(locTypeDto.getLocType1());
}else if (locTypeDto.getLocType2()==7||locTypeDto.getLocType2()==8){
//2鍙峰贩閬� 2绉嶈揣鐗╃被鍨�
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index f6c7e8e..f9e25d6 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -429,6 +429,7 @@
LocMast locMast = locMastService.selectById(dto.getLocNo());
if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
+// locMast.setScWeight(weight); // 鏁存墭閲嶉噺璁板叆搴撲綅 涓哄苟鏉垮嚭搴撶瓫閫夋墭鐩樺仛鍑嗗
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index be9dcd9..9d7f043 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -270,20 +270,19 @@
SELECT
ROW_NUMBER() OVER (ORDER BY SUM(a.anfme) DESC) AS row,
-- 鍒嗙粍瀛楁
- a.model,
+ a.matnr,
a.pro_type AS proType,
a.out_order_no AS outOrderNo,
a.temp2 AS temp2,
-- 闈炲垎缁勫瓧娈电敤鑱氬悎鍑芥暟鑾峰彇涓�涓唬琛ㄥ�硷紙渚嬪MAX鎴朚IN锛�
- MAX(a.matnr) AS matnr,
MAX(a.specs) AS specs,
- MAX(a.temp1) AS temp1,
+ MAX(a.maktx) AS maktx,
-- 鑱氬悎鏁伴噺
SUM(a.anfme) AS anfme
FROM asr_loc_detl a
WHERE 1=1
<include refid="stockOutConditionTwo"/>
- GROUP BY a.model, a.pro_type, a.out_order_no, a.temp2
+ GROUP BY a.matnr, a.pro_type, a.out_order_no, a.temp2
) t
WHERE t.row BETWEEN ((#{pageNumber}-1)*#{pageSize}+1) AND (#{pageNumber}*#{pageSize})
</select>
@@ -295,11 +294,11 @@
select count(1) as count from
(
select
- a.model
+ a.matnr
from asr_loc_detl a
where 1=1
<include refid="stockOutCondition"></include>
- group by a.model
+ group by a.matnr
) b
</select>
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 1efab2e..6cbdc02 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -126,7 +126,7 @@
<if test="locType2 == 5">
and lev1 in(4,5)
</if>
- order by lev1 asc,bay1 asc
+ order by bay1 asc,lev1 asc,row1 asc
</select>
<select id="queryLocToTwo" resultMap="BaseResultMap">
@@ -138,7 +138,7 @@
<if test="locType2 == 8">
and lev1 in(3,4,5,6)
</if>
- order by lev1 asc,bay1 asc
+ order by bay1 asc,lev1 asc,row1 asc
</select>
<select id="queryLocToSpecal" resultMap="BaseResultMap">
@@ -150,7 +150,7 @@
<if test="locType1 == 2">
and lev1 in(2,3)
</if>
- order by lev1 asc,bay1 asc
+ order by bay1 asc,lev1 asc,row1 asc
</select>
<select id="queryLocToOneEmpty" resultMap="BaseResultMap">
@@ -162,6 +162,6 @@
<if test="locType2 == 6">
and lev1 in(1,2,3)
</if>
- order by lev1 asc,bay1 asc
+ order by bay1 asc,lev1 asc,row1 asc
</select>
</mapper>
diff --git a/src/main/webapp/static/js/adjDetl/adjDetl.js b/src/main/webapp/static/js/adjDetl/adjDetl.js
index 5789a32..abdcfa8 100644
--- a/src/main/webapp/static/js/adjDetl/adjDetl.js
+++ b/src/main/webapp/static/js/adjDetl/adjDetl.js
@@ -33,7 +33,7 @@
// ,{field: 'adjCtns', align: 'center',title: '鍙樻洿绠辨暟'}
,{field: 'adjQty', align: 'center',title: '鍙樻洿鏁伴噺'}
// ,{field: 'adjWt', align: 'center',title: '鍙樻洿閲嶉噺'}
- ,{field: 'memo', align: 'center',title: '澶囨敞',hide:true}
+ ,{field: 'memo', align: 'center',title: '鎿嶄綔绫诲瀷'}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
// ,{field: 'appeUser', align: 'center',title: '鍒涘缓鑰�'}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 87a177c..b490aad 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -49,6 +49,35 @@
return cols;
}
+// 楂樹寒鏄剧ず搴撻緞澶т簬绛変簬1澶╃殑琛� - 娣辩孩鑹�
+function highlightStoreDateRows() {
+ setTimeout(function() {
+ var rows = $('.layui-table-body .layui-table tbody tr');
+
+ rows.each(function() {
+ var $row = $(this);
+ var storeDateText = $row.find('td[data-field="storeDate"] .layui-table-cell').text().trim();
+
+ // 灏濊瘯瑙ｆ瀽搴撻緞鏁板��
+ var storeDays = parseInt(storeDateText);
+
+ // 濡傛灉搴撻緞澶т簬绛変簬1澶╋紝娣诲姞娣辩孩鑹茶儗鏅�
+ if (!isNaN(storeDays) && storeDays >= 1) {
+ $row.css({
+ 'background-color': '#f5222d', // 娣辩孩鑹茶儗鏅�
+ 'color': '#ffffff', // 鐧借壊鏂囧瓧
+ 'font-weight': 'bold'
+ });
+
+ // 涔熷彲浠ョ粰姣忎釜鍗曞厓鏍兼坊鍔犺竟妗�
+ $row.find('td').css({
+ 'border-bottom': '1px solid #ff7875'
+ });
+ }
+ });
+ }, 50); // 绋嶅井澧炲姞寤惰繜纭繚DOM瀹屽叏娓叉煋
+}
+
layui.use(['table','laydate', 'form'], function(){
var table = layui.table;
var $ = layui.jquery;
@@ -89,6 +118,10 @@
}
pageCurr=curr;
limit();
+
+ // 娣诲姞楂樹寒鏁堟灉 - 鍦ㄦ瘡娆¤〃鏍兼覆鏌撳畬鎴愬悗鎵ц
+ highlightStoreDateRows();
+
form.on('checkbox(tableCheckbox)', function (data) {
var _index = $(data.elem).attr('table-index')||0;
if(data.elem.checked){
@@ -119,6 +152,9 @@
}
pageCurr=curr;
limit();
+
+ // 鎺掑簭鍚庨噸鏂板簲鐢ㄩ珮浜�
+ highlightStoreDateRows();
}
});
});
@@ -137,7 +173,7 @@
content: 'locDetl_detail.html',
success: function(layero, index){
layer.getChildFrame('#data-detail-submit-edit', index).hide();
- clearFormVal(layer.getChildFrame('#detail', index));
+ clearFormVal(layer.getChildFrame('#detail', index));
layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
}
});
@@ -146,6 +182,10 @@
tableIns.reload({
page: {
curr: pageCurr
+ },
+ done: function(res, curr, count) {
+ // 鍒锋柊鍚庨噸鏂板簲鐢ㄩ珮浜�
+ highlightStoreDateRows();
}
});
limit();
@@ -267,35 +307,35 @@
if (param === undefined) {
layer.msg("鏃犳暟鎹�");
} else {
- layer.open({
- type: 2,
- title: '搴撲綅鍙疯鎯�',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
- content: '../locMast/locMast_detail.html',
- success: function(layero, index){
- $.ajax({
- url: baseUrl+"/locMast/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- } else if (res.code === 403){
- parent.location.href = "/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
+ layer.open({
+ type: 2,
+ title: '搴撲綅鍙疯鎯�',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: '../locMast/locMast_detail.html',
+ success: function(layero, index){
+ $.ajax({
+ url: baseUrl+"/locMast/"+ param +"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200){
+ setFormVal(layer.getChildFrame('#detail', index), res.data, true);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ } else if (res.code === 403){
+ parent.location.href = "/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+ });
}
break;
case 'modiUser':
@@ -303,35 +343,35 @@
if (param === undefined) {
layer.msg("鏃犳暟鎹�");
} else {
- layer.open({
- type: 2,
- title: '淇敼浜哄憳璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
- content: '../user/user_detail.html',
- success: function(layero, index){
- $.ajax({
- url: baseUrl+"/user/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- } else if (res.code === 403){
- parent.location.href = "/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
+ layer.open({
+ type: 2,
+ title: '淇敼浜哄憳璇︽儏',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: '../user/user_detail.html',
+ success: function(layero, index){
+ $.ajax({
+ url: baseUrl+"/user/"+ param +"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200){
+ setFormVal(layer.getChildFrame('#detail', index), res.data, true);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ } else if (res.code === 403){
+ parent.location.href = "/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+ });
}
break;
case 'appeUser':
@@ -339,35 +379,35 @@
if (param === undefined) {
layer.msg("鏃犳暟鎹�");
} else {
- layer.open({
- type: 2,
- title: '鍒涘缓鑰呰鎯�',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
- content: '../user/user_detail.html',
- success: function(layero, index){
- $.ajax({
- url: baseUrl+"/user/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- } else if (res.code === 403){
- parent.location.href = "/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
+ layer.open({
+ type: 2,
+ title: '鍒涘缓鑰呰鎯�',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: '../user/user_detail.html',
+ success: function(layero, index){
+ $.ajax({
+ url: baseUrl+"/user/"+ param +"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200){
+ setFormVal(layer.getChildFrame('#detail', index), res.data, true);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ } else if (res.code === 403){
+ parent.location.href = "/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+ });
}
break;
// 鏌ョ湅绠�鍥�
@@ -493,13 +533,13 @@
tableReload(false);
});
-
// 鎼滅储鏍忛噸缃簨浠�
form.on('submit(reset)', function (data) {
pageCurr = 1;
clearFormVal($('#search-box'));
tableReload(false);
});
+
layDate.render({
elem: '.layui-laydate-range'
,type: 'datetime'
@@ -515,7 +555,6 @@
type: 'datetime'
});
-
});
// 鍏抽棴鍔ㄤ綔
@@ -524,8 +563,7 @@
});
function tableReload(child) {
- var searchData = {
- };
+ var searchData = {};
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
});
@@ -539,11 +577,18 @@
top.location.href = baseUrl+"/";
}
pageCurr=curr;
+
+ // 鎼滅储/閲嶇疆鍚庨噸鏂板簲鐢ㄩ珮浜�
+ highlightStoreDateRows();
+
if (res.data.length === 0 && count !== 0) {
tableIns.reload({
where: searchData,
page: {
curr: pageCurr-1
+ },
+ done: function(res2, curr2, count2) {
+ highlightStoreDateRows();
}
});
pageCurr -= 1;
@@ -605,4 +650,4 @@
if (event.keyCode === 13) {
$("#search").click();
}
-});
+});
\ No newline at end of file
diff --git a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
index 80815a6..026c96d 100644
--- a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
+++ b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
@@ -34,7 +34,7 @@
{field: 'matnr', title:'浜у搧缂栫爜', align: 'center'},
{field: 'model', title:'浜у搧浠ｇ爜', align: 'center'},
{field: 'specs', title:'浜у搧瑙勬牸', align: 'center'},
- {field: 'temp1', title:'浜у搧鎬荤О', align: 'center'},
+ {field: 'maktx', title:'浜у搧鎬荤О', align: 'center'},
{field: 'outOrderNo', title:'鍚堝悓鍙�', align: 'center'},
{field: 'proType', title:'灞炴��', align: 'center'},
{field: 'temp2', title:'瀹㈡埛鍥惧彿', align: 'center'},
diff --git a/src/main/webapp/static/js/pakStore/clampOut.js b/src/main/webapp/static/js/pakStore/clampOut.js
index da70def..94d946b 100644
--- a/src/main/webapp/static/js/pakStore/clampOut.js
+++ b/src/main/webapp/static/js/pakStore/clampOut.js
@@ -1,78 +1,14 @@
-var locDetlLayerIdx;
-var tableIns;
-var locDetlData = [];
-function getCol() {
- var cols = [
- {field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
- ];
- cols.push.apply(cols, detlCols);
- return cols;
-}
+var pageCurr;
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
-}).use(['table','laydate', 'form', 'admin', 'tableMerge'], function() {
+}).use(['table','laydate', 'form', 'admin'], function() {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
var layDate = layui.laydate;
var form = layui.form;
var admin = layui.admin;
- var tableMerge = layui.tableMerge;
-
- tableIns = table.render({
- elem: '#chooseData',
- headers: {token: localStorage.getItem('token')},
- data: [],
- even: true,
- toolbar: '#toolbar',
- cellMinWidth: 50,
- cols: [getCol()],
- done: function(res, curr, count) {
- tableMerge.render(this);
- limit();
- getOutBound();
- }
- });
-
- // 鐩戝惉澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(chooseData)', function (obj) {
- switch (obj.event) {
- case 'outbound':
- if (locDetlData.length === 0){
- layer.msg('璇峰厛娣诲姞骞舵澘搴撳瓨', {icon: 2});
- } else {
- var staNo = $("#staNoSelect").val();
- if (staNo === "" || staNo === null){
- layer.msg("璇烽�夋嫨鍑哄簱绔�", {icon: 2});
- return;
- }
- let param = {
- outSite: staNo,
- locDetls: locDetlData
- }
- $.ajax({
- url: baseUrl+"/locClamp/out/start",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify(param),
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- locDetlData = [];
- tableIns.reload({data: locDetlData});
- layer.msg(res.msg, {icon: 1});
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- } else {
- layer.msg(res.msg, {icon: 2})
- }
- }
- });
- }
- break;
- }
- });
// 鑾峰彇鍑哄簱鍙�
function getOutBound(){
@@ -97,42 +33,159 @@
})
}
- $(document).on('click','#mat-query', function () {
- let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
- locDetlLayerIdx = layer.open({
- type: 2,
- title: false,
- closeBtn: false,
- maxmin: false,
- area: ['90%', '85%'],
- shadeClose: true,
- content: 'clampDetlQuery.html',
- success: function(layero, index){
- layer.close(loadIndex);
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#locMast',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/locMast/list/auth/lev/clamp',
+ page: true,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ where: {loc_sts: "F"},
+ even: true,
+ toolbar: '#toolbar',
+ defaultToolbar: ['filter'],
+ cellMinWidth: 50,
+ cols: [[
+ {type: 'checkbox', fixed: 'left'}
+ ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�',sort:true}
+ ,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��',width:200}
+ // ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
+ ,{field: 'barcode', align: 'center',title: '鎵樼洏鏉＄爜'}
+ ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
+ ,{field: 'scWeight', align: 'center',title: '鎵樼洏鎬婚噸'}
+ ,{field: 'row1', align: 'center',title: '鎺�'}
+ ,{field: 'bay1', align: 'center',title: '鍒�'}
+ ,{field: 'lev1', align: 'center',title: '灞�'}
+ ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
+ var html = "<input value='fullPlt' type='checkbox' disabled=鈥榙isabled鈥� lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
+ if(row.fullPlt === 'Y'){html += " checked ";}
+ html += ">";
+ return html;
+ },width:80}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser'}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
}
- });
- })
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ getOutBound();
+ limit();
+ form.on('checkbox(tableCheckbox)', function (data) {
+ var _index = $(data.elem).attr('table-index')||0;
+ if(data.elem.checked){
+ res.data[_index][data.value] = 'Y';
+ }else{
+ res.data[_index][data.value] = 'N';
+ }
+ });
+ }
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(locMast)', function (obj) {
+ var data = table.checkStatus(obj.config.id).data;
+ switch (obj.event) {
+ case 'outbound':
+ var staNo = $("#staNoSelect").val();
+ if (staNo === "" || staNo === null){
+ layer.msg("璇烽�夋嫨鍑哄簱鍙�");
+ return;
+ }
+ var locNos = [];
+ data.forEach(function(elem) {
+ locNos.push(elem.locNo);
+ });
+ if (data.length === 0){
+ layer.msg('璇疯嚦灏戦�変腑涓�琛屾暟鎹�');
+ } else {
+ $.ajax({
+ url: baseUrl+"/locClamp/out/start",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ outSite: staNo,
+ locNos: locNos
+ },
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ tableReload(); // 閲嶈浇琛ㄦ牸
+ getOutBound(); // 閲嶈浇鍑哄簱鍙�
+ layer.msg(res.msg);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ });
+ }
+ break;
+ }
+ });
+
+ // 鎼滅储鏍忔悳绱簨浠�
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ $('#detlTable').css("display", 'none');
+ tableReload(false);
+ getOutBound();
+ });
+
+ // 鎼滅储鏍忛噸缃簨浠�
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ $('#detlTable').css("display", 'none');
+ tableReload(false);
+ getOutBound();
+ });
})
-// 娣诲姞琛ㄦ牸鏁版嵁
-function addTableData(data) {
- for (let i=0;i<data.length;i++){
- let pass = false;
- for (let j=0;j<locDetlData.length;j++){
- if (data[i].matnr === locDetlData[j].matnr && data[i].batch === locDetlData[j].batch && data[i].locNo$ === locDetlData[j].locNo$) {
- pass = true;
- break;
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ (child ? parent.tableIns : tableIns).reload({
+ where: searchData,
+ page: {
+ curr: pageCurr
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
}
+ pageCurr=curr;
+ if (res.data.length === 0 && count !== 0) {
+ tableIns.reload({
+ where: searchData,
+ page: {
+ curr: pageCurr-1
+ }
+ });
+ pageCurr -= 1;
+ }
+ limit(child);
}
- if (pass) {
- data.splice(i--, 1);
- } else {
- data[i]["count"] = data[i]["anfme"];
- }
-
- }
- locDetlData.push.apply(locDetlData, data);
- tableIns.reload({data: locDetlData});
- layer.close(locDetlLayerIdx);
-}
\ No newline at end of file
+ });
+}
diff --git a/src/main/webapp/static/js/pakStore/clampOut_old.js b/src/main/webapp/static/js/pakStore/clampOut_old.js
new file mode 100644
index 0000000..da70def
--- /dev/null
+++ b/src/main/webapp/static/js/pakStore/clampOut_old.js
@@ -0,0 +1,138 @@
+var locDetlLayerIdx;
+var tableIns;
+var locDetlData = [];
+function getCol() {
+ var cols = [
+ {field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
+ ];
+ cols.push.apply(cols, detlCols);
+ return cols;
+}
+
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin', 'tableMerge'], function() {
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+ var tableMerge = layui.tableMerge;
+
+ tableIns = table.render({
+ elem: '#chooseData',
+ headers: {token: localStorage.getItem('token')},
+ data: [],
+ even: true,
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [getCol()],
+ done: function(res, curr, count) {
+ tableMerge.render(this);
+ limit();
+ getOutBound();
+ }
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(chooseData)', function (obj) {
+ switch (obj.event) {
+ case 'outbound':
+ if (locDetlData.length === 0){
+ layer.msg('璇峰厛娣诲姞骞舵澘搴撳瓨', {icon: 2});
+ } else {
+ var staNo = $("#staNoSelect").val();
+ if (staNo === "" || staNo === null){
+ layer.msg("璇烽�夋嫨鍑哄簱绔�", {icon: 2});
+ return;
+ }
+ let param = {
+ outSite: staNo,
+ locDetls: locDetlData
+ }
+ $.ajax({
+ url: baseUrl+"/locClamp/out/start",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ locDetlData = [];
+ tableIns.reload({data: locDetlData});
+ layer.msg(res.msg, {icon: 1});
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ }
+ break;
+ }
+ });
+
+ // 鑾峰彇鍑哄簱鍙�
+ function getOutBound(){
+ $.ajax({
+ url: baseUrl+"/available/take/check/site",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ var tpl = $("#takeSiteSelectTemplate").html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ $('#staNoSelect').append(html);
+ form.render('select');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+
+ $(document).on('click','#mat-query', function () {
+ let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
+ locDetlLayerIdx = layer.open({
+ type: 2,
+ title: false,
+ closeBtn: false,
+ maxmin: false,
+ area: ['90%', '85%'],
+ shadeClose: true,
+ content: 'clampDetlQuery.html',
+ success: function(layero, index){
+ layer.close(loadIndex);
+ }
+ });
+ })
+
+})
+
+// 娣诲姞琛ㄦ牸鏁版嵁
+function addTableData(data) {
+ for (let i=0;i<data.length;i++){
+ let pass = false;
+ for (let j=0;j<locDetlData.length;j++){
+ if (data[i].matnr === locDetlData[j].matnr && data[i].batch === locDetlData[j].batch && data[i].locNo$ === locDetlData[j].locNo$) {
+ pass = true;
+ break;
+ }
+ }
+ if (pass) {
+ data.splice(i--, 1);
+ } else {
+ data[i]["count"] = data[i]["anfme"];
+ }
+
+ }
+ locDetlData.push.apply(locDetlData, data);
+ tableIns.reload({data: locDetlData});
+ layer.close(locDetlLayerIdx);
+}
\ No newline at end of file
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index dfc7db2..ef62d60 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -88,9 +88,6 @@
<script type="text/html" id="operate">
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
</script>
-<!--<script type="text/html" id="operate1">
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="showPic" >鏌ョ湅绠�鍥�</a>
-</script>-->
<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>
diff --git a/src/main/webapp/views/pakStore/clampDetlQuery.html b/src/main/webapp/views/pakStore/clampDetlQuery_old.html
similarity index 100%
rename from src/main/webapp/views/pakStore/clampDetlQuery.html
rename to src/main/webapp/views/pakStore/clampDetlQuery_old.html
diff --git a/src/main/webapp/views/pakStore/clampOut.html b/src/main/webapp/views/pakStore/clampOut.html
index 58c2bf3..142d1cb 100644
--- a/src/main/webapp/views/pakStore/clampOut.html
+++ b/src/main/webapp/views/pakStore/clampOut.html
@@ -21,7 +21,26 @@
background-color: #fff;
border-radius: 5px;
box-shadow: 0 0 3px rgba(0,0,0,.3);
+ padding-bottom: 20px;
}
+ #search-box {
+ padding: 30px 0 20px 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;
+ }
+
#staNoSpan {
text-align: center;
display: inline-block;
@@ -46,79 +65,75 @@
#btn-outbound {
margin-left: 60px;
- }
-
- /*----------------------------------*/
- .function-area {
- padding: 20px 50px;
- }
- .function-btn {
- font-size: 16px;
- padding: 1px 2px;
- width: 100px;
- height: 50px;
- border-color: #2b425b;
- border-radius: 4px;
- border-width: 2px;
- background: none;
- border-style: solid;
- transition: 0.4s;
- cursor: pointer;
- letter-spacing: 1.5px;
- }
- .function-btn:hover {
- background-color: #2b425b;
- color: #fff;
- }
-
- /*#mat-query {*/
- /* display: none;*/
- /*}*/
- #btn-outbound {
display: none;
}
+
</style>
</head>
-<body style="padding-bottom: 30px">
+<body>
-<!-- 鍔熻兘鍖� -->
-<div class="function-area">
- <button id="mat-query" class="function-btn">鎻愬彇搴撳瓨</button>
-</div>
-
-<hr>
-
-<!-- 琛ㄦ牸 -->
-<div style="padding-bottom: 5px; margin-bottom: 45px">
-
- <!-- 澶撮儴 -->
- <script type="text/html" id="toolbar">
- <div class="layui-form">
- <div class="layui-btn-container">
- <!-- 1.閫夋嫨鍑哄簱鍙� -->
- <span id="staNoSpan">鍑哄簱鍙ｏ細</span>
- <select id="staNoSelect" lay-verify="required">
- <option value="">璇烽�夋嫨绔欑偣</option>
- </select>
- <!-- 2.鍚姩鍑哄簱 -->
- <button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outbound">骞舵澘鍑哄簱</button>
- </div>
+<!-- 鎼滅储鏍� -->
+<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="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
</div>
- </script>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="crn_no" placeholder="鍫嗗灈鏈哄彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="row1" placeholder="鎺�" lay-verify="number" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="bay1" placeholder="鍒�" lay-verify="number" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="lev1" placeholder="灞�" lay-verify="number" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="size">
+ <option value="">璇烽�夋嫨鎵樼洏绫诲瀷</option>
+ <option value="2000*1500*170">2000*1500*170</option>
+ <option value="1500*1500*170">1500*1500*170</option>
+ <option value="2600*1500*160">2600*1500*160</option>
+ <option value="1300*1500*160">1300*1500*160</option>
+ </select>
+ </div>
+ </div>
- <!-- 琛� -->
- <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>
+ <!-- 寰呮坊鍔� -->
+ <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>
-<script type="text/template" id="takeSiteSelectTemplate">
- {{#each data}}
- <option value="{{this}}">{{this}}</option>
- {{/each}}
+<script type="text/html" id="toolbar">
+ <div class="layui-form">
+ <div class="layui-btn-container">
+ <!-- 1.閫夋嫨鍑哄簱鍙� -->
+ <span id="staNoSpan">骞舵澘鍑哄簱鍙ｏ細</span>
+ <select id="staNoSelect" lay-verify="required">
+ <option value="">璇烽�夋嫨绔欑偣</option>
+ </select>
+ <!-- 2.鍚姩鍑哄簱 -->
+ <button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outbound">鍚姩鍑哄簱</button>
+ </div>
+ </div>
</script>
+
+<!-- 绌烘澘搴撲綅琛� -->
+<table class="layui-hide" id="locMast" lay-filter="locMast"></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>
@@ -127,6 +142,15 @@
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/js/pakStore/clampOut.js" charset="utf-8"></script>
-</body>
-</html>
+<!--鍚姩鍑哄簱-->
+<div id="outboundDiv">
+</div>
+
+<script type="text/template" id="takeSiteSelectTemplate">
+ {{#each data}}
+ <option value="{{this}}">{{this}}</option>
+ {{/each}}
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/views/pakStore/clampOut_old.html b/src/main/webapp/views/pakStore/clampOut_old.html
new file mode 100644
index 0000000..ab38802
--- /dev/null
+++ b/src/main/webapp/views/pakStore/clampOut_old.html
@@ -0,0 +1,132 @@
+<!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);
+ }
+ #staNoSpan {
+ text-align: center;
+ display: inline-block;
+ width: 100px;
+ font-size: 13px;
+ }
+ .layui-btn-container .layui-form-select {
+ display: inline-block;
+ width: 150px;
+ height: 30px;
+ }
+ .layui-btn-container .layui-form-select.layui-form-selected {
+ display: inline-block;
+ width: 150px;
+ }
+ .layui-btn-container .layui-select-title input {
+ font-size: 13px;
+ }
+ .layui-btn-container .layui-anim.layui-anim-upbit dd {
+ font-size: 13px;
+ }
+
+ #btn-outbound {
+ margin-left: 60px;
+ }
+
+ /*----------------------------------*/
+ .function-area {
+ padding: 20px 50px;
+ }
+ .function-btn {
+ font-size: 16px;
+ padding: 1px 2px;
+ width: 100px;
+ height: 50px;
+ border-color: #2b425b;
+ border-radius: 4px;
+ border-width: 2px;
+ background: none;
+ border-style: solid;
+ transition: 0.4s;
+ cursor: pointer;
+ letter-spacing: 1.5px;
+ }
+ .function-btn:hover {
+ background-color: #2b425b;
+ color: #fff;
+ }
+
+ /*#mat-query {*/
+ /* display: none;*/
+ /*}*/
+ #btn-outbound {
+ display: none;
+ }
+ </style>
+</head>
+<body style="padding-bottom: 30px">
+
+<!-- 鍔熻兘鍖� -->
+<div class="function-area">
+ <button id="mat-query" class="function-btn">鎻愬彇搴撳瓨</button>
+</div>
+
+<hr>
+
+<!-- 琛ㄦ牸 -->
+<div style="padding-bottom: 5px; margin-bottom: 45px">
+
+ <!-- 澶撮儴 -->
+ <script type="text/html" id="toolbar">
+ <div class="layui-form">
+ <div class="layui-btn-container">
+ <!-- 1.閫夋嫨鍑哄簱鍙� -->
+ <span id="staNoSpan">鍑哄簱鍙ｏ細</span>
+ <select id="staNoSelect" lay-verify="required">
+ <option value="">璇烽�夋嫨绔欑偣</option>
+ </select>
+ <!-- 2.鍚姩鍑哄簱 -->
+ <button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outbound">骞舵澘鍑哄簱</button>
+ </div>
+ </div>
+ </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>
+</div>
+
+<script type="text/template" id="takeSiteSelectTemplate">
+ {{#each data}}
+ <option value="{{this}}">{{this}}</option>
+ {{/each}}
+</script>
+
+<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/pakStore/clampOut_old.js" charset="utf-8"></script>
+
+</body>
+</html>
+
diff --git a/src/main/webapp/views/pda/index.html b/src/main/webapp/views/pda/index.html
index 9d1ca2b..8394811 100644
--- a/src/main/webapp/views/pda/index.html
+++ b/src/main/webapp/views/pda/index.html
@@ -75,7 +75,7 @@
<ul class="nav">
<li><a id="comb" onclick="nav(this.id)" class="nav-select" href="#">缁勬墭</a></li>
<li><a id="clamp" onclick="nav(this.id)" class="nav-select" href="#">骞舵澘</a></li>
-<!-- <li><a id="inventory" onclick="nav(this.id)" class="nav-select" href="#">鐩樼偣</a></li>-->
+ <li><a id="inventory" onclick="nav(this.id)" class="nav-select" href="#">鐩樼偣</a></li>
<!-- <li><a id="stockIn" onclick="nav(this.id)" class="nav-unselect" href="#">鍏ュ簱</a></li>-->
<!-- <li><a id="stockOut" onclick="nav(this.id)" class="nav-unselect" href="#">鍑哄簱</a></li>-->
</ul>
--
Gitblit v1.9.1