From 5ee8d702138b67a8070e850ba622aa4b07d64fb9 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 30 十月 2025 13:00:08 +0800
Subject: [PATCH] #1
---
src/main/webapp/views/locDetl/locDetl.html | 2
src/main/java/com/zy/asrs/utils/MatExcelListener.java | 11
src/main/java/com/zy/asrs/controller/HalfBarcodeController.java | 2
src/main/webapp/views/locDetlStatis/locDetlStatis.html | 2
src/main/webapp/views/mat/mat.html | 20
src/main/webapp/views/halfBarcode/halfBarcode_old.html | 4
src/main/webapp/views/pakStore/locDetlQuery.html | 2
src/main/webapp/static/js/pakStore/clampOut.js | 4
src/main/java/com/zy/asrs/controller/WrkMastController.java | 3
src/main/java/com/zy/asrs/controller/WaitPakinController.java | 47 +++
src/main/webapp/static/js/matInOut/matInOut_old.js | 4
src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java | 12 -
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 14 -
src/main/java/com/zy/asrs/controller/MatController.java | 16 -
src/main/webapp/static/js/common.js | 20
src/main/java/com/zy/common/service/CommonService.java | 38 +-
src/main/java/com/zy/system/controller/UserController.java | 2
src/main/webapp/views/pakStore/clampDetlQuery.html | 6
src/main/java/com/zy/asrs/controller/LocDetlController.java | 21 +
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 59 -----
src/main/webapp/views/barcodeMatnr/barcodeMatnr.html | 2
src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html | 2
src/main/webapp/views/waitPakin/waitPakin_comb.html | 132 ++++++++++++
src/main/webapp/views/barcodeMatnr/barcodeMatnr_clamp.html | 2
src/main/webapp/static/js/locDetl/locDetl.js | 6
/dev/null | 19 -
src/main/webapp/views/matInOut/matInOut_old.html | 2
src/main/webapp/static/js/waitPakin/waitPakin.js | 46 ++++
src/main/webapp/views/adjDetl/adjDetl_detail.html | 2
src/main/webapp/views/waitPakin/waitPakin_clamp.html | 132 ++++++++++++
src/main/webapp/views/waitPakin/waitPakin.html | 2
src/main/webapp/static/js/halfBarcode/halfBarcode_old.js | 0
src/main/webapp/views/barcodeMatnr/barcodeMatnr_detail.html | 2
33 files changed, 442 insertions(+), 196 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java b/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
index 2eeae2d..436216e 100644
--- a/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
+++ b/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
@@ -120,18 +120,6 @@
@RequestMapping(value = "/barcodeMatnr/add1/auth")
@ManagerAuth
public R comb(WaitPakin waitPakin) {
- Mat mat = matService.selectById(waitPakin.getModiUser());
- MatBarcode matBarcode = matBarcodeService.selectbyMatnr(mat.getMatnr());
- if (matBarcode == null){
- throw new CoolException("璇ョ墿鏂欐湭涓庢墭鐩樼粦瀹�");
- }else {
- if (!matBarcode.getZpallet().equals(waitPakin.getBarcode())){
- throw new CoolException("璇ョ墿鏂欎笌鍏朵粬鎵樼洏缁戝畾锛屼笉鑳戒笌褰撳墠鎵樼洏"+waitPakin.getBarcode()+"缁戝畾锛屼笌璇ョ墿鏂欑粦瀹氱殑鎵樼洏鏄�"+matBarcode.getZpallet());
- }
- }
- if (mat.getColor().equals("鎶ュ簾")){
- throw new CoolException("璇ョ墿鏂欏凡鎶ュ簾锛岃鍕跨粦瀹�");
- }
if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())||Cools.isEmpty(waitPakin.getAnfme())){
return R.error(BaseRes.PARAM);
}
diff --git a/src/main/java/com/zy/asrs/controller/HalfBarcodeController.java b/src/main/java/com/zy/asrs/controller/HalfBarcodeController.java
index 56f332f..089377d 100644
--- a/src/main/java/com/zy/asrs/controller/HalfBarcodeController.java
+++ b/src/main/java/com/zy/asrs/controller/HalfBarcodeController.java
@@ -26,7 +26,7 @@
/*
* 鐗╂枡鎵樼洏缁戝畾鍒嗛〉鏌ヨ
* */
- @RequestMapping(value = "/halfBarcode/list/auth")
+ //@RequestMapping(value = "/halfBarcode/list/auth")
@ManagerAuth
public R list(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
diff --git a/src/main/java/com/zy/asrs/controller/InOutController.java b/src/main/java/com/zy/asrs/controller/InOutController.java
deleted file mode 100644
index 9f33e49..0000000
--- a/src/main/java/com/zy/asrs/controller/InOutController.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.zy.asrs.controller;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.core.annotations.ManagerAuth;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.R;
-import com.zy.asrs.entity.InOut;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.service.InOutService;
-import com.zy.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
-@RestController
-@RequestMapping
-public class InOutController extends BaseController{
-
- @Autowired
- private InOutService inOutService;
-
- @RequestMapping(value = "/matInOut/list/auth")
- @ManagerAuth
- public R list(@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 Map<String, Object> param){
- EntityWrapper<InOut> wrapper = new EntityWrapper<>();
- Object query_date = param.get("query_date");
- param.remove("query_date");
- excludeTrash(param);
- convert(param, wrapper);
- allLike(InOut.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- if (query_date!=null){
- if (query_date.toString().contains(" - ")) {
- String[] dates = query_date.toString().split(" - ");
- wrapper.ge("appe_time", dates[0]).le("appe_time",dates[1]);
- }
- }
- return R.ok(inOutService.selectPage(new Page<>(curr, limit), wrapper));
- }
-
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
- String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
- String[] dates = val.split(RANGE_TIME_LINK);
- wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
- wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
- } else {
- if (entry.getKey().equals("locNo")) {
- wrapper.eq("loc_no", String.valueOf(entry.getValue()));
- } else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
- }
- }
- }
- }
-}
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index e834291..8dc443a 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -106,6 +106,27 @@
return R.ok(stockOut);
}
+ @RequestMapping(value = "/clamp/out/list/auth")
+ @ManagerAuth
+ public R clampOutList(@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");
+ }
+ }
+ Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
+ if (stockOut.getRecords().size()==0){
+ stockOut = locDetlService.getStockOut(toPage(1, limit, param, LocDetl.class));
+ }
+ return R.ok(stockOut);
+ }
+
@RequestMapping(value = "/locDetl/list/auth")// /locDetl/list/auth 鎺ュ彛闂
@ManagerAuth
public R list(@RequestParam(defaultValue = "1")Integer curr,
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 06d4717..021d4f3 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -43,8 +43,6 @@
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
- private InOutService inOutService;
- @Autowired
private MatBarcodeService matBarcodeService;
@RequestMapping(value = "/mat/auto/matnr/auth")
@@ -141,9 +139,6 @@
if (!matService.insert(mat)) {
throw new CoolException("鍟嗗搧妗ｆ娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
- if (!inOutService.insert(inOut)){
- throw new CoolException("鍟嗗搧淇℃伅娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
return R.ok();
}
@@ -153,20 +148,9 @@
if (Cools.isEmpty(mat) || null==mat.getId()){
return R.error();
}
- if (mat.getColor().equals("姝ｅ父")){
- mat.setColor("鎶ュ簾");
- }else if (mat.getColor().equals("鎶ュ簾")){
- mat.setColor("姝ｅ父");
- }
- InOut inOut = inOutService.selectByMatnr(mat.getMatnr());
- inOut.setMatnr(mat.getMatnr());
- inOut.setMaktx(mat.getMaktx());
- inOut.setColor(mat.getColor());
- inOut.setSpecs(mat.getSpecs());
mat.setUpdateBy(getUserId());
mat.setUpdateTime(new Date());
matService.updateById(mat);
- inOutService.updateById(inOut);
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
index 3ac94fd..95b349c 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
@@ -10,12 +10,11 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.WaitPakinService;
-import com.zy.asrs.service.WrkMastService;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.CombParam;
+import com.zy.asrs.entity.param.MobileAdjustParam;
+import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -35,6 +34,10 @@
private OrderDetlService orderDetlService;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private MobileService mobileService;
+ @Autowired
+ private MatService matService;
@RequestMapping(value = "/waitPakin/{id}/auth")
@ManagerAuth
@@ -150,4 +153,36 @@
return R.ok();
}
+ /*鍏ュ簱閫氱煡妗ｇ晫闈㈢粍鎵� 闀囨睙鎭掔珛*/
+ @RequestMapping(value = "waitPakin/comb/auth")
+ @ManagerAuth
+ public R comb(WaitPakin waitPakin) {
+ if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())||Cools.isEmpty(waitPakin.getAnfme())){
+ return R.error(BaseRes.PARAM);
+ }
+ mobileService.combToWms(waitPakin);
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
+ /*鍏ュ簱閫氱煡妗ｇ晫闈㈠苟鏉� 闀囨睙鎭掔珛*/
+ @RequestMapping(value = "/waitPakin/clamp/auth")
+ @ManagerAuth
+ public R clamp(WaitPakin waitPakin) {
+ if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())||Cools.isEmpty(waitPakin.getAnfme())){
+ return R.error(BaseRes.PARAM);
+ }
+ Mat mat = matService.selectById(waitPakin.getModiUser());
+ MobileAdjustParam combParam=new MobileAdjustParam();
+ ArrayList<CombParam.CombMat> combMats=new ArrayList<>();
+ CombParam.CombMat combMat=new CombParam.CombMat();
+ combMat.setSpecs(mat.getSpecs());
+ combMat.setMatnr(mat.getMatnr());
+ combMat.setMaktx(mat.getMaktx());
+ combMat.setAnfme(waitPakin.getAnfme());
+ combMats.add(combMat);
+ combParam.setBarcode(waitPakin.getBarcode());
+ combParam.setCombMats(combMats);
+ mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
+ return R.ok("骞舵澘鎴愬姛");
+ }
}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index f10840f..3a6a9c5 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -85,9 +85,6 @@
}
wrkMast.setModiUser(getUserId());
wrkMast.setModiTime(new Date());
- if (wrkMast.getWrkSts() == 2){
- wrkMast.setPltType(0);
- }
wrkMastService.updateById(wrkMast);
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/mapper/InOutMapper.java b/src/main/java/com/zy/asrs/mapper/InOutMapper.java
deleted file mode 100644
index bf23440..0000000
--- a/src/main/java/com/zy/asrs/mapper/InOutMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.InOut;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface InOutMapper extends BaseMapper<InOut> {
- @Select("select top 1 * from man_mat_inout where matnr = #{matnr}")
- InOut selectByMatnr(String matnr);
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/InOutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/InOutServiceImpl.java
deleted file mode 100644
index a83e08c..0000000
--- a/src/main/java/com/zy/asrs/service/impl/InOutServiceImpl.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.zy.asrs.entity.InOut;
-import com.zy.asrs.entity.MatBarcode;
-import com.zy.asrs.mapper.InOutMapper;
-import com.zy.asrs.service.InOutService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service("InOutService")
-public class InOutServiceImpl extends ServiceImpl<InOutMapper, InOut> implements InOutService {
-
- @Autowired
- private InOutMapper inOutMapper;
-
- @Override
- public InOut selectByMatnr(String matnr) {
- return inOutMapper.selectByMatnr(matnr);
- }
-}
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 ad206ea..5025977 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -711,6 +711,7 @@
detl.sync(wrkDetl);
detl.setWrkNo(wrkMast.getWrkNo());
detl.setZpallet(wrkMast.getBarcode());
+ detl.setIoTime(new Date());
wrkDetlService.insert(detl);
recordRecordLog = recordRecordLog + "\n" + "鏂板涓�鏉℃槑缁�:" + "\t鍟嗗搧缂栧彿锛�" + wrkDetl.getMatnr() + "\t鎵瑰彿锛�" + wrkDetl.getBatch() + "\t鏁伴噺锛�" + wrkDetl.getAnfme();
adjDetl.setOriQty(0.0);
@@ -734,12 +735,6 @@
@Override
public void combToWms(WaitPakin waitPakin) {
- // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
-// if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
-// eq("zpallet", waitPakin.getBarcode()).eq("io_status", "N")) > 0) {
-// throw new CoolException(waitPakin.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
-// }
-
if (waitPakin.getBarcode().length() != 8) {
throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + waitPakin.getBarcode());
}
@@ -770,13 +765,6 @@
Mat mat = matService.selectByMatnr(dto.getMatnr());
if (Cools.isEmpty(mat)) {
throw new CoolException(dto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
- //鏍￠獙褰撳墠鐗╂枡涓庢墭鐩樼粦瀹氫俊鎭槸鍚︽纭�
- MatBarcode mb = matBarcodeService.selectbyMatnr(dto.getMatnr());
- if (mb != null){
- if (!mb.getZpallet().equals(waitPakin.getBarcode())){
- throw new CoolException(detlDto.getMatnr() + "璇ョ墿鏂欎笌鍏朵粬鎵樼洏缁戝畾锛岃鍏堣В缁�");
- }
}
WaitPakin waitPakin1 = new WaitPakin();
waitPakin1.sync(mat);
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index e173bdb..ea659f7 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -36,8 +36,6 @@
private WaitPakinService waitPakinService;
@Autowired
private OrderDetlService orderDetlService;
- @Autowired
- private InOutService inOutService;
public ReturnT<String> start(WrkMast wrkMast) {
// 4.鍏ュ簱瀹屾垚
@@ -69,15 +67,6 @@
throw new CoolException("绌烘澘鍏ュ簱鏉＄爜涓嶈兘涓虹┖");
}
locMast.setBarcode(wrkMast.getBarcode());
- if (Integer.parseInt(wrkMast.getBarcode().substring(0,1))==5){
- locMast.setLocType2((short)5);
- }else if (Integer.parseInt(wrkMast.getBarcode().substring(0,1))==6){
- locMast.setLocType2((short)6);
- }else if(Integer.parseInt(wrkMast.getBarcode().substring(0,1))==7){
- locMast.setLocType2((short)7);
- }else if(Integer.parseInt(wrkMast.getBarcode().substring(0,1))==8){
- locMast.setLocType2((short)8);
- }
locMast.setLocSts("D");
locMast.setIoTime(now);
locMast.setModiTime(now);
@@ -122,14 +111,7 @@
locDetl.setAppeTime(now);
locDetl.setModel(wrkDetl.getModel());
- InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
- if (inOut != null){
- inOut.setTemp1("鍦ㄥ簱");
-// inOut.setModiTime(now.toString());
- }
- if (!inOutService.updateById(inOut)){
- return FAIL.setMsg("鏇存柊妯″叿灞炴�уけ璐�");
- }
+ locDetl.setSPgNO(wrkDetl.getZpallet().substring(0,1));//骞舵澘鍑哄簱鏍规嵁鎵樼洏绫诲瀷鍘婚�夋嫨
if (!locDetlService.insert(locDetl)) {
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
@@ -181,17 +163,6 @@
LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl);
if (locDetl != null) {
-
- InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
- if (inOut != null){
- inOut.setTemp1("涓嶅湪搴�");
-// inOut.setModiTime(now.toString());
- }
- if (!inOutService.updateById(inOut)){
- return FAIL.setMsg("鏇存柊妯″叿灞炴�уけ璐�");
- }
-
-
if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl)) {
// exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -249,16 +220,6 @@
return FAIL.setMsg("骞舵澘鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
} else {
-
- InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
- if (inOut != null){
- inOut.setTemp1("鍦ㄥ簱");
-// inOut.setModiTime(now.toString());
- }
- if (!inOutService.updateById(inOut)){
- return FAIL.setMsg("鏇存柊妯″叿灞炴�уけ璐�");
- }
-
locDetl = new LocDetl();
locDetl.sync(wrkDetl);
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
@@ -266,6 +227,9 @@
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
+
+ locDetl.setSPgNO(wrkDetl.getZpallet().substring(0,1));//骞舵澘鍑哄簱鏍规嵁鎵樼洏绫诲瀷鍘婚�夋嫨
+
if (!locDetlService.insert(locDetl)) {
// exceptionHandle("骞舵澘鍏ュ簱 ===>> 鏂板搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -390,18 +354,6 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
}
-
- for (WrkDetl wrkDetl : wrkDetls101) {
- InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
- if (inOut != null){
- inOut.setTemp1("涓嶅湪搴�");
-// inOut.setModiTime(now.toString());
- }
- if (!inOutService.updateById(inOut)){
- return FAIL.setMsg("鏇存柊妯″叿灞炴�уけ璐�");
- }
- }
-
for (WrkDetl wrkDetl : wrkDetls101) {
// 鏇存柊璁㈠崟瀹屾垚鏁伴噺
OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl);
@@ -427,7 +379,6 @@
// 淇敼婧愬簱浣嶇姸鎬� R ===>> O
if (locMast.getLocSts().equals("R")) {
locMast.setLocSts("O");
- locMast.setBarcode("");//鎵樼洏涓庡簱浣嶇粦瀹�
locMast.setModiTime(now);
locMast.setIoTime(now);
if (!locMastService.updateById(locMast)) {
@@ -442,8 +393,6 @@
// 淇敼搴撲綅鐘舵�� R ===>> O
if (locMast.getLocSts().equals("R")) {
locMast.setLocSts("O");
- locMast.setBarcode("");//鎵樼洏涓庡簱浣嶇粦瀹�
- locMast.setLocType2((short)0);
locMast.setModiTime(now);
locMast.setIoTime(now);
if (!locMastService.updateById(locMast)) {
diff --git a/src/main/java/com/zy/asrs/utils/MatExcelListener.java b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
index c4eec8f..842b9cc 100644
--- a/src/main/java/com/zy/asrs/utils/MatExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
@@ -132,20 +132,11 @@
// 鍟嗗搧
Mat mat = matService.selectByMatnr(excel.getMatnr());
if (mat == null) {
- InOut inOut=new InOut();
mat = excel;
mat.setTagId(tagId);
- mat.setMatnr(excel.getMatnr()+"__"+excel.getName());
- inOut.setMatnr(mat.getMatnr());
- inOut.setMaktx(mat.getMaktx());
- inOut.setColor(mat.getColor());
- inOut.setSpecs(mat.getSpecs());
- inOut.setTemp1("");
+ mat.setMatnr(excel.getMatnr());
if (!matService.insert(mat)) {
throw new CoolException("淇濆瓨鍟嗗搧妗ｆ澶辫触锛屽晢鍝佺紪鐮侊細" + excel.getMatnr());
- }
- if (!inOutService.insert(inOut)){
- throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屽晢鍝佺紪鐮侊細" + excel.getMatnr());
}
total++;
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 6811548..e249b28 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -206,7 +206,7 @@
}
if (signRule1) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O").eq("loc_type2",locTypeDto.getLocType2()));
for (LocMast locMast1 : locMasts) {
if (VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
@@ -260,7 +260,7 @@
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //浜掗�氱増
if (staDescId == 10) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow).eq("loc_type2",locTypeDto.getLocType2()));
if (locMasts.size() > 0) {
for (LocMast loc : locMasts) {
if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
@@ -318,29 +318,29 @@
if (Cools.isEmpty(locMast) && crnNo != 0) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O").eq("loc_type2",locTypeDto.getLocType2()));
List<LocMast> locMastList = new ArrayList<>();
- locMasts.sort(new Comparator<LocMast>() {
- @Override
- public int compare(LocMast o1, LocMast o2) {
- int b1 = o1.getBay1();
- int b2 = o2.getBay1();
- if (o1.getBay1() >= 15) {
- b1 = Math.abs(15 - o1.getBay1());
- }
- if (o2.getBay1() >= 15) {
- b2 = Math.abs(15 - o2.getBay1());
- }
- return b2 - b1;
- }
- });
+// locMasts.sort(new Comparator<LocMast>() {
+// @Override
+// public int compare(LocMast o1, LocMast o2) {
+// int b1 = o1.getBay1();
+// int b2 = o2.getBay1();
+// if (o1.getBay1() >= 15) {
+// b1 = Math.abs(15 - o1.getBay1());
+// }
+// if (o2.getBay1() >= 15) {
+// b2 = Math.abs(15 - o2.getBay1());
+// }
+// return b2 - b1;
+// }
+// });
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
- LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc).eq("loc_sts", "O"));
- if (!Cools.isEmpty(locMast2)) {
- locMast = locMast2;
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc).eq("loc_sts", "O").eq("loc_type2",locTypeDto.getLocType2()));
+ if (Cools.isEmpty(locMast2)) {
+ locMast = locMast1;
break;
}
}
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index 893ee88..f8012ac 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -149,7 +149,7 @@
@ManagerAuth
public R query(String condition) {
EntityWrapper<Mat> wrapper = new EntityWrapper<>();
- wrapper.like("maktx", condition);
+ wrapper.like("matnr", condition);
Page<Mat> page = matService.selectPage(new Page<>(0, 50), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Mat mat : page.getRecords()){
diff --git a/src/main/resources/mapper/InOutMapper.xml b/src/main/resources/mapper/InOutMapper.xml
deleted file mode 100644
index eacd449..0000000
--- a/src/main/resources/mapper/InOutMapper.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.InOutMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.InOut">
- <id column="id" property="id" />
- <result column="tag_id" property="tagId" />
- <result column="matnr" property="matnr" />
- <result column="maktx" property="maktx" />
- <result column="name" property="name" />
- <result column="specs" property="specs" />
- <result column="color" property="color" />
- <result column="barcode" property="barcode" />
- <result column="supp" property="supp" />
- <result column="supp_code" property="suppCode" />
- <result column="manu_date" property="manuDate" />
- </resultMap>
-</mapper>
\ No newline at end of file
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 1021e5b..6ffb5dc 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -181,15 +181,15 @@
}
var matCols = [
- {field: 'matnr', align: 'center',title: '鍟嗗搧妯″叿鍚嶇О', width: 180}
+ {field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 180}
// {field: 'id', align: 'center',title: 'ID'}
// ,{field: 'uuid', align: 'center',title: '缂栧彿'}
// ,{field: 'tagId$', align: 'center',title: '鎵�灞炲綊绫�'}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍨嬫潗鍨嬪彿', width: 200}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
// ,{field: 'name', align: 'center',title: '鍒悕'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'name', align: 'center',title: '濂楀彿'}
- ,{field: 'color', align: 'center',title: '鐘舵��', hide: true}
+ ,{field: 'name', align: 'center',title: '鍨嬪彿'}
+ ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
@@ -228,9 +228,9 @@
]
var detlCols = [
- {field: 'matnr', align: 'center',title: '鍟嗗搧妯″叿鍚嶇О', sort:true}
- ,{field: 'model', align: 'center',title: '濂楀彿', hide: false}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍨嬫潗鍨嬪彿', sort:true}
+ {field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', sort:true}
+ ,{field: 'model', align: 'center',title: '鍨嬪彿', hide: false}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
,{field: 'spgNO', align: 'center',title: '娲惧伐鍗曞彿', hide:true,sort:true}
,{field: 'batch', align: 'center',title: '鎵规', hide:true,sort:true}
@@ -269,9 +269,9 @@
]
var halfBarcodeCols = [
- {field: 'matnr', align: 'center',title: '鍟嗗搧妯″叿鍚嶇О', sort:true, hide: true}
- ,{field: 'model', align: 'center',title: '濂楀彿', hide: true}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍨嬫潗鍨嬪彿', sort:true, hide: true}
+ {field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', sort:true, hide: true}
+ ,{field: 'model', align: 'center',title: '鍨嬪彿', hide: true}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true, hide: true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
,{field: 'spgNO', align: 'center',title: '娲惧伐鍗曞彿', hide:true,sort:true}
,{field: 'batch', align: 'center',title: '鎵规', hide:true,sort:true}
diff --git a/src/main/webapp/static/js/halfBarcode/halfBarcode.js b/src/main/webapp/static/js/halfBarcode/halfBarcode_old.js
similarity index 100%
rename from src/main/webapp/static/js/halfBarcode/halfBarcode.js
rename to src/main/webapp/static/js/halfBarcode/halfBarcode_old.js
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index d440b26..b0b17da 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -3,9 +3,9 @@
var cols = [
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
,{field: 'storeDate', align: 'center',title: '搴撻緞(澶�)', sort:true}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧妯″叿鍚嶇О', sort:true}
- ,{field: 'model', align: 'center',title: '濂楀彿'}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍨嬫潗鍨嬪彿', sort:true}
+ ,{field: 'matnr', align: 'center',title: '鐗╂枡缂栫爜', sort:true}
+ ,{field: 'model', align: 'center',title: '鍨嬪彿'}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'spgNO', align: 'center',title: '娲惧伐鍗曞彿', hide:true,sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 200,hide:true, sort:true}
diff --git a/src/main/webapp/static/js/matInOut/matInOut.js b/src/main/webapp/static/js/matInOut/matInOut_old.js
similarity index 98%
rename from src/main/webapp/static/js/matInOut/matInOut.js
rename to src/main/webapp/static/js/matInOut/matInOut_old.js
index 032cd1e..a7a944b 100644
--- a/src/main/webapp/static/js/matInOut/matInOut.js
+++ b/src/main/webapp/static/js/matInOut/matInOut_old.js
@@ -3,9 +3,9 @@
var cols = [
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�', hide: true}
,{field: 'storeDate', align: 'center',title: '搴撻緞(澶�)', sort:true, hide: true}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧妯″叿鍚嶇О', sort:true}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍨嬫潗鍨嬪彿', sort:true}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'spgNO', align: 'center',title: '娲惧伐鍗曞彿', hide:true,sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 200,hide:true, sort:true}
diff --git a/src/main/webapp/static/js/pakStore/clampOut.js b/src/main/webapp/static/js/pakStore/clampOut.js
index 4bd49aa..da70def 100644
--- a/src/main/webapp/static/js/pakStore/clampOut.js
+++ b/src/main/webapp/static/js/pakStore/clampOut.js
@@ -40,11 +40,11 @@
switch (obj.event) {
case 'outbound':
if (locDetlData.length === 0){
- layer.msg('璇峰厛娣诲姞鐩樼偣搴撳瓨', {icon: 2});
+ layer.msg('璇峰厛娣诲姞骞舵澘搴撳瓨', {icon: 2});
} else {
var staNo = $("#staNoSelect").val();
if (staNo === "" || staNo === null){
- layer.msg("璇烽�夋嫨鐩樼偣绔�", {icon: 2});
+ layer.msg("璇烽�夋嫨鍑哄簱绔�", {icon: 2});
return;
}
let param = {
diff --git a/src/main/webapp/static/js/waitPakin/waitPakin.js b/src/main/webapp/static/js/waitPakin/waitPakin.js
index 4027f58..1cbf059 100644
--- a/src/main/webapp/static/js/waitPakin/waitPakin.js
+++ b/src/main/webapp/static/js/waitPakin/waitPakin.js
@@ -169,6 +169,34 @@
});
}
break;
+ case 'combData':
+ layer.open({
+ type: 2,
+ title: '缁勬墭',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ content: 'waitPakin_comb.html',
+ success: function(layero, index){
+ layer.getChildFrame('#data-detail-submit-edit', index).hide();
+ clearFormVal(layer.getChildFrame('#detail', index));
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ }
+ });
+ break;
+ case 'clampData':
+ layer.open({
+ type: 2,
+ title: '骞舵澘',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ content: 'waitPakin_clamp.html',
+ success: function(layero, index){
+ layer.getChildFrame('#data-detail-submit-edit', index).hide();
+ clearFormVal(layer.getChildFrame('#detail', index));
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ }
+ });
+ break;
case 'exportData':
layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
var titles=[];
@@ -337,6 +365,24 @@
method("add");
});
+ // 鏁版嵁缁勬墭鍔ㄤ綔
+ form.on('submit(comb)', function () {
+ if (banMsg != null){
+ layer.msg(banMsg);
+ return;
+ }
+ method("comb");
+ });
+
+ // 鏁版嵁骞舵澘鍔ㄤ綔
+ form.on('submit(clamp)', function () {
+ if (banMsg != null){
+ layer.msg(banMsg);
+ return;
+ }
+ method("clamp");
+ });
+
// 鏁版嵁淇敼鍔ㄤ綔
form.on('submit(edit)', function () {
method("update")
diff --git a/src/main/webapp/views/adjDetl/adjDetl_detail.html b/src/main/webapp/views/adjDetl/adjDetl_detail.html
index 872937f..415b4c1 100644
--- a/src/main/webapp/views/adjDetl/adjDetl_detail.html
+++ b/src/main/webapp/views/adjDetl/adjDetl_detail.html
@@ -42,7 +42,7 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label"><span class="not-null">*</span>鐗╂枡缂栧彿锛�</label>
+ <label class="layui-form-label"><span class="not-null">*</span>鍟嗗搧缂栫爜锛�</label>
<div class="layui-input-inline cool-auto-complete">
<input id="matnr" class="layui-input" type="text" lay-verify="required" style="display: none">
<input id="matnr$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
diff --git a/src/main/webapp/views/barcodeMatnr/barcodeMatnr.html b/src/main/webapp/views/barcodeMatnr/barcodeMatnr.html
index 21efd59..c177e88 100644
--- a/src/main/webapp/views/barcodeMatnr/barcodeMatnr.html
+++ b/src/main/webapp/views/barcodeMatnr/barcodeMatnr.html
@@ -21,7 +21,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧妯″叿鍚嶇О" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栫爜" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/barcodeMatnr/barcodeMatnr_clamp.html b/src/main/webapp/views/barcodeMatnr/barcodeMatnr_clamp.html
index 99f550e..12c28f2 100644
--- a/src/main/webapp/views/barcodeMatnr/barcodeMatnr_clamp.html
+++ b/src/main/webapp/views/barcodeMatnr/barcodeMatnr_clamp.html
@@ -78,7 +78,7 @@
<!-- </div>-->
<!-- </div>-->
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鍟嗗搧妯″叿鍚嶇О锛�</label>
+ <label class="layui-form-label">鍟嗗搧缂栫爜锛�</label>
<div class="layui-input-inline cool-auto-complete">
<input id="modiUser" class="layui-input" type="text" lay-verify="number" style="display: none">
<input id="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
diff --git a/src/main/webapp/views/barcodeMatnr/barcodeMatnr_detail.html b/src/main/webapp/views/barcodeMatnr/barcodeMatnr_detail.html
index de67064..2eef65f 100644
--- a/src/main/webapp/views/barcodeMatnr/barcodeMatnr_detail.html
+++ b/src/main/webapp/views/barcodeMatnr/barcodeMatnr_detail.html
@@ -78,7 +78,7 @@
<!-- </div>-->
<!-- </div>-->
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鍟嗗搧妯″叿鍚嶇О锛�</label>
+ <label class="layui-form-label">鍟嗗搧缂栫爜锛�</label>
<div class="layui-input-inline cool-auto-complete">
<input id="modiUser" class="layui-input" type="text" lay-verify="number" style="display: none">
<input id="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
diff --git a/src/main/webapp/views/halfBarcode/halfBarcode.html b/src/main/webapp/views/halfBarcode/halfBarcode_old.html
similarity index 96%
rename from src/main/webapp/views/halfBarcode/halfBarcode.html
rename to src/main/webapp/views/halfBarcode/halfBarcode_old.html
index fadc617..c9e40e8 100644
--- a/src/main/webapp/views/halfBarcode/halfBarcode.html
+++ b/src/main/webapp/views/halfBarcode/halfBarcode_old.html
@@ -21,7 +21,7 @@
</div>
<!-- <div class="layui-inline">-->
<!-- <div class="layui-input-inline">-->
-<!-- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧妯″叿鍚嶇О" autocomplete="off">-->
+<!-- <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡缂栧彿" autocomplete="off">-->
<!-- </div>-->
<!-- </div>-->
<div class="layui-inline">
@@ -65,7 +65,7 @@
<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/halfBarcode/halfBarcode.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/halfBarcode/halfBarcode_old.js" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
</body>
</html>
\ 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 c4351f8..9aad3f5 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -31,7 +31,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧妯″叿鍚嶇О" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栫爜" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/locDetlStatis/locDetlStatis.html b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
index 6d9b363..3683eb4 100644
--- a/src/main/webapp/views/locDetlStatis/locDetlStatis.html
+++ b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
@@ -21,7 +21,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧妯″叿鍚嶇О" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栫爜" autocomplete="off">
</div>
</div>
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index a209aec..873c4f6 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -86,15 +86,15 @@
<!-- 琛ㄦ牸宸ュ叿鏍�2 -->
<div id="search-box" class="layui-form toolbar" style="padding-top: 5px">
<div class="layui-inline">
- <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍟嗗搧缂栧彿:</label>
+ <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍟嗗搧缂栫爜:</label>
<div class="layui-input-inline">
- <input name="matnr" class="layui-input" placeholder="杈撳叆鍟嗗搧缂栧彿"/>
+ <input name="matnr" class="layui-input" placeholder="杈撳叆鍟嗗搧缂栫爜"/>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="padding: 8px 15px 8px 15px">濂楀彿:</label>
+ <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍨嬪彿:</label>
<div class="layui-input-inline">
- <input name="name" class="layui-input" placeholder="杈撳叆濂楀彿"/>
+ <input name="name" class="layui-input" placeholder="杈撳叆鍨嬪彿"/>
</div>
</div>
<div class="layui-inline">
@@ -128,7 +128,7 @@
<button class="layui-btn layui-btn-sm" id="btn-print-batch" lay-event="btnPrintBatch">鎵归噺鎵撳嵃</button>
<button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-add" lay-event="addData">鏂板</button>
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
- <button class="layui-btn layui-btn-sm layui-btn-danger"><a onclick="importImage()" style="font-size: 15px"><i class="layui-icon layui-icon-upload"></i>涓婁紶绠�鍥�</a></button>
+<!-- <button class="layui-btn layui-btn-sm layui-btn-danger"><a onclick="importImage()" style="font-size: 15px"><i class="layui-icon layui-icon-upload"></i>涓婁紶绠�鍥�</a></button>-->
<li style="display: none"><input id="importImage" type="file" onchange="uploadImage(this)" ></li>
<!-- 鍟嗗搧/鐗╂枡 鏁版嵁涓績 -->
<div class="dropdown-menu" style="float: right">
@@ -150,7 +150,7 @@
<script type="text/html" id="operate">
<a class="layui-btn layui-btn-xs btn-edit layui-btn-primary" lay-event="edit">淇敼</a>
- <a class="layui-btn layui-btn-xs btn-edit layui-btn-primary" lay-event="editBarcode">缁戝畾</a>
+<!-- <a class="layui-btn layui-btn-xs btn-edit layui-btn-primary" lay-event="editBarcode">缁戝畾</a>-->
<button class="layui-btn layui-btn-xs btn-print" lay-event="btnPrint">鎵撳嵃</button>
</script>
@@ -209,9 +209,9 @@
</div>
<div class="layui-form-item">
- <label class="layui-form-label">濂楀彿</label>
+ <label class="layui-form-label">鍨嬪彿</label>
<div class="layui-input-block">
- <input name="name" placeholder="璇疯緭鍏ュ鍙�" class="layui-input">
+ <input name="name" placeholder="璇疯緭鍏ュ瀷鍙�" class="layui-input">
</div>
</div>
@@ -321,9 +321,9 @@
</div>
<div class="layui-form-item">
- <label class="layui-form-label">濂楀彿</label>
+ <label class="layui-form-label">鍨嬪彿</label>
<div class="layui-input-block">
- <input name="name" placeholder="璇疯緭鍏ュ鍙�" class="layui-input">
+ <input name="name" placeholder="璇疯緭鍏ュ瀷鍙�" class="layui-input">
</div>
</div>
diff --git a/src/main/webapp/views/matInOut/matInOut.html b/src/main/webapp/views/matInOut/matInOut_old.html
similarity index 98%
rename from src/main/webapp/views/matInOut/matInOut.html
rename to src/main/webapp/views/matInOut/matInOut_old.html
index a32dab4..d2f62ef 100644
--- a/src/main/webapp/views/matInOut/matInOut.html
+++ b/src/main/webapp/views/matInOut/matInOut_old.html
@@ -103,7 +103,7 @@
<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/matInOut/matInOut.js?s=1" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/matInOut/matInOut_old.js?s=1" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
diff --git a/src/main/webapp/views/pakStore/clampDetlQuery.html b/src/main/webapp/views/pakStore/clampDetlQuery.html
index 6118080..2cb137b 100644
--- a/src/main/webapp/views/pakStore/clampDetlQuery.html
+++ b/src/main/webapp/views/pakStore/clampDetlQuery.html
@@ -73,7 +73,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧妯″叿鍚嶇О" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栫爜" autocomplete="off">
</div>
</div>
<!-- <div class="layui-inline">-->
@@ -110,7 +110,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <select name="loc_type2">
+ <select name="sPgNO">
<option value="">璇烽�夋嫨鎵樼洏绫诲瀷</option>
<option value="4">绗竴绉�</option>
<option value="5">绗簩绉�</option>
@@ -173,7 +173,7 @@
locDetlTableIns = table.render({
elem: '#stockOut',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/stock/out/list/auth',
+ url: baseUrl+'/clamp/out/list/auth',
page: true,
limit: 20,
limits: [20, 50, 100, 200, 500],
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 18cee64..63193af 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -64,7 +64,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧妯″叿鍚嶇О" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栫爜" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/waitPakin/waitPakin.html b/src/main/webapp/views/waitPakin/waitPakin.html
index 331f54d..cfd8cae 100644
--- a/src/main/webapp/views/waitPakin/waitPakin.html
+++ b/src/main/webapp/views/waitPakin/waitPakin.html
@@ -46,6 +46,8 @@
<!-- <button class="layui-btn layui-btn-sm" id="btn-wrk" lay-event="addWrk">鐢熸垚浠诲姟</button>-->
<button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
<button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-sm" id="btn-comb" lay-event="combData">缁勬墭</button>
+ <button class="layui-btn layui-btn-sm" id="btn-clamp" lay-event="clampData">骞舵澘</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="">瀵煎嚭</button>
</div>
</script>
diff --git a/src/main/webapp/views/waitPakin/waitPakin_clamp.html b/src/main/webapp/views/waitPakin/waitPakin_clamp.html
new file mode 100644
index 0000000..36d5a95
--- /dev/null
+++ b/src/main/webapp/views/waitPakin/waitPakin_clamp.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/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 璇︽儏 -->
+<div id="data-detail" class="layer_self_wrap">
+ <form id="detail" class="layui-form">
+ <!--
+ <div class="layui-inline" style="display: none">
+ <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="id" class="layui-input" type="text" placeholder="缂栧彿">
+ </div>
+ </div>
+ -->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="id" class="layui-input" type="text" onkeyup="check(this.id, 'waitPakin')" lay-verify="number" >-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鎵� 鐩� 鐮侊細</label>
+ <div class="layui-input-inline">
+ <input id="barcode" class="layui-input" type="text">
+ </div>
+ </div>
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鍟嗗搧缂栧彿锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="matnr" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鐗╂枡鎻忚堪锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="maktx" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鏁般��銆�閲忥細</label>
+ <div class="layui-input-inline">
+ <input id="anfme" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鍗曘��銆�浣嶏細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="unit" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鐘躲��銆�鎬侊細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="status" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">澶囥��銆�娉細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="memo" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">淇敼鏃堕棿锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="modiTime$" class="layui-input" type="text" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鍟嗗搧缂栫爜锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="modiUser" class="layui-input" type="text" lay-verify="number" 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'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">娣诲姞鏃堕棿锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="appeTime$" class="layui-input" type="text" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鍒� 寤� 鑰咃細</label>-->
+<!-- <div class="layui-input-inline cool-auto-complete">-->
+<!-- <input id="appeUser" class="layui-input" type="text" lay-verify="number" 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>-->
+
+
+ <hr class="layui-bg-gray">
+
+ <div id="data-detail-btn" class="layui-btn-container layui-form-item">
+ <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="clamp">淇濆瓨</div>
+ <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">淇敼</div>
+ <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">鍏抽棴</div>
+ </div>
+
+<!-- <div id="prompt">-->
+<!-- 娓╅Θ鎻愮ず锛氳浠旂粏濉啓鐩稿叧淇℃伅锛�<span class="extrude"><span class="not-null">*</span> 涓哄繀濉�夐」銆�</span>-->
+<!-- </div>-->
+ </form>
+</div>
+</body>
+<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/waitPakin/waitPakin.js" charset="utf-8"></script>
+</html>
+
diff --git a/src/main/webapp/views/waitPakin/waitPakin_comb.html b/src/main/webapp/views/waitPakin/waitPakin_comb.html
new file mode 100644
index 0000000..c57f104
--- /dev/null
+++ b/src/main/webapp/views/waitPakin/waitPakin_comb.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/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 璇︽儏 -->
+<div id="data-detail" class="layer_self_wrap">
+ <form id="detail" class="layui-form">
+ <!--
+ <div class="layui-inline" style="display: none">
+ <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="id" class="layui-input" type="text" placeholder="缂栧彿">
+ </div>
+ </div>
+ -->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="id" class="layui-input" type="text" onkeyup="check(this.id, 'waitPakin')" lay-verify="number" >-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鎵� 鐩� 鐮侊細</label>
+ <div class="layui-input-inline">
+ <input id="barcode" class="layui-input" type="text">
+ </div>
+ </div>
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鍟嗗搧缂栧彿锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="matnr" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鐗╂枡鎻忚堪锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="maktx" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鏁般��銆�閲忥細</label>
+ <div class="layui-input-inline">
+ <input id="anfme" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鍗曘��銆�浣嶏細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="unit" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鐘躲��銆�鎬侊細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="status" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">澶囥��銆�娉細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="memo" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">淇敼鏃堕棿锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="modiTime$" class="layui-input" type="text" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鐗╂枡缂栫爜锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="modiUser" class="layui-input" type="text" lay-verify="number" 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'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">娣诲姞鏃堕棿锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="appeTime$" class="layui-input" type="text" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鍒� 寤� 鑰咃細</label>-->
+<!-- <div class="layui-input-inline cool-auto-complete">-->
+<!-- <input id="appeUser" class="layui-input" type="text" lay-verify="number" 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>-->
+
+
+ <hr class="layui-bg-gray">
+
+ <div id="data-detail-btn" class="layui-btn-container layui-form-item">
+ <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="comb">淇濆瓨</div>
+ <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">淇敼</div>
+ <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">鍏抽棴</div>
+ </div>
+
+<!-- <div id="prompt">-->
+<!-- 娓╅Θ鎻愮ず锛氳浠旂粏濉啓鐩稿叧淇℃伅锛�<span class="extrude"><span class="not-null">*</span> 涓哄繀濉�夐」銆�</span>-->
+<!-- </div>-->
+ </form>
+</div>
+</body>
+<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/waitPakin/waitPakin.js" charset="utf-8"></script>
+</html>
+
diff --git a/src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html b/src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html
index 72bf6f1..7a7fd33 100644
--- a/src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html
+++ b/src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html
@@ -36,7 +36,7 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label"><span class="not-null">*</span>鐗╂枡缂栧彿锛�</label>
+ <label class="layui-form-label"><span class="not-null">*</span>鍟嗗搧缂栫爜锛�</label>
<div class="layui-input-inline">
<input id="matnr" class="layui-input" type="text" lay-verify="required" >
</div>
--
Gitblit v1.9.1