From edb03c5169709da2e6d39a999328ce9bf92affff Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 13 十月 2025 15:28:37 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/utils/MatExcelListener.java | 1
src/main/java/com/zy/system/controller/UserController.java | 2
src/main/webapp/static/js/pakStore/emptyOut.js | 2
src/main/java/com/zy/third/erp/task/ERPItemService.java | 2
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 20 ++++++++--
src/main/webapp/views/mat/mat.html | 16 ++++----
src/main/webapp/views/pakStore/emptyOut.html | 2
src/main/java/com/zy/asrs/controller/WrkMastController.java | 3 +
src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java | 31 +++++++++++++++
src/main/java/com/zy/asrs/mapper/MatMapper.java | 2
src/main/resources/mapper/MatMapper.xml | 4 +-
src/main/java/com/zy/asrs/entity/Mat.java | 6 +-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 8 ++-
src/main/java/com/zy/asrs/controller/MatController.java | 2
src/main/webapp/static/js/common.js | 8 ++--
src/main/java/com/zy/asrs/service/MatService.java | 2
16 files changed, 80 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java b/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
index c9855a2..8670366 100644
--- a/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
+++ b/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
@@ -7,11 +7,14 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MatBarcode;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.service.MatBarcodeService;
+import com.zy.asrs.service.MatService;
import com.zy.asrs.service.MobileService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +23,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -30,6 +34,8 @@
private MatBarcodeService matBarcodeService;
@Autowired
private MobileService mobileService;
+ @Autowired
+ private MatService matService;
/*
* 鐗╂枡鎵樼洏缁戝畾鍒嗛〉鏌ヨ
* */
@@ -92,6 +98,15 @@
@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 (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())||Cools.isEmpty(waitPakin.getAnfme())){
return R.error(BaseRes.PARAM);
}
@@ -108,8 +123,24 @@
if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())||Cools.isEmpty(waitPakin.getAnfme())){
return R.error(BaseRes.PARAM);
}
+ 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());
+ }
+ }
MobileAdjustParam combParam=new MobileAdjustParam();
+ ArrayList<CombParam.CombMat> combMats=new ArrayList<>();
+ CombParam.CombMat combMat=new CombParam.CombMat();
+ 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/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index f974ac2..11edc8d 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -97,7 +97,7 @@
return R.ok(matService.getPage2(new Page<>(curr, limit)
, String.valueOf(tagId)
, param.get("matnr")
- , param.get("maktx")
+ , param.get("name")
, param.get("specs"))
);
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index 3a6a9c5..f10840f 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -85,6 +85,9 @@
}
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/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 5e779e6..989462c 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -191,14 +191,14 @@
*/
@ApiModelProperty(value= "闀垮害")
@ExcelProperty(value = "闀垮害")
- private Double length;
+ private String length;
/**
* 浣撶Н
*/
@ApiModelProperty(value= "浣撶Н")
@ExcelProperty(value = "浣撶Н")
- private Double volume;
+ private String volume;
/**
* 涓夋柟缂栫爜
@@ -361,7 +361,7 @@
public Mat() {}
- public Mat(String uuid,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Mat(String uuid,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,String length,String volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.tagId = tagId;
this.matnr = matnr;
diff --git a/src/main/java/com/zy/asrs/mapper/MatMapper.java b/src/main/java/com/zy/asrs/mapper/MatMapper.java
index 111bec9..2a94dac 100644
--- a/src/main/java/com/zy/asrs/mapper/MatMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/MatMapper.java
@@ -15,7 +15,7 @@
public interface MatMapper extends BaseMapper<Mat> {
List<Mat> listByPage(Page page, @Param("tagId") String tagId, @Param("matnr") Object matnr, @Param("maktx") Object maktx);
- List<Mat> listByPage2(Page page, @Param("tagId") String tagId, @Param("matnr") Object matnr, @Param("maktx") Object maktx, @Param("specs") Object specs);
+ List<Mat> listByPage2(Page page, @Param("tagId") String tagId, @Param("matnr") Object matnr, @Param("name") Object name, @Param("specs") Object specs);
Mat selectByMatnr(@Param("matnr")String matnr);
diff --git a/src/main/java/com/zy/asrs/service/MatService.java b/src/main/java/com/zy/asrs/service/MatService.java
index 498171e..1c81a7c 100644
--- a/src/main/java/com/zy/asrs/service/MatService.java
+++ b/src/main/java/com/zy/asrs/service/MatService.java
@@ -9,7 +9,7 @@
public interface MatService extends IService<Mat> {
Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx);
- Page<Mat> getPage2(Page page, String tagId, Object matnr, Object maktx, Object specs);
+ Page<Mat> getPage2(Page page, String tagId, Object matnr, Object name, Object specs);
Mat selectByMatnr(String matnr);
List<Mat> selectByMatnrLink(String 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 af100de..ad206ea 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -11,6 +11,7 @@
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.OffSaleParam;
+import com.zy.asrs.entity.param.PickInParam;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
@@ -702,7 +703,7 @@
adjDetl.setMatnr(wrkDetl.getMatnr());
- adjDetl.setBatch(wrkDetl.getBatch());
+// adjDetl.setBatch(wrkDetl.getBatch());
adjDetl.setAdjQty(wrkDetl.getAnfme());
if (Cools.isEmpty(wrkDetlOld)) {
@@ -716,7 +717,7 @@
adjDetlService.insert(adjDetl);
} else if (wrkDetlOld.getAnfme() != wrkDetl.getAnfme()) {
- wrkDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+ wrkDetlService.updateAnfme(wrkDetl.getAnfme() + wrkDetlOld.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
recordRecordLog = recordRecordLog + "\n" + "鏇存柊涓�鏉℃槑缁�:" + "\t鍟嗗搧缂栧彿锛�" + wrkDetl.getMatnr() + "\t鎵瑰彿锛�" + wrkDetl.getBatch() + "\t鍘熸暟閲忥細" + wrkDetlOld.getAnfme() + "\t鏂版暟閲忥細" + wrkDetl.getAnfme();
adjDetl.setOriQty(wrkDetlOld.getAnfme());
adjDetlService.insert(adjDetl);
@@ -744,8 +745,9 @@
}
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", waitPakin.getBarcode()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", waitPakin.getBarcode()));
+ WrkMast wrkMast = wrkMastService.selectByBarcode(waitPakin.getBarcode());
int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", waitPakin.getBarcode()));
- if (countLoc > 0 || countWrk > 0) {
+ if (countLoc > 0 || (countWrk > 0 && wrkMast.getWrkSts() != 15)) {
throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + waitPakin.getBarcode());
}
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 738215a..914e08c 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
@@ -62,8 +63,18 @@
case 10:
// 淇敼搴撲綅鐘舵��=D
if (locMast.getLocSts().equals("S") || locMast.getLocSts().equals("Q")) {
- if (!Cools.isEmpty(wrkMast.getBarcode())) {
- locMast.setBarcode(wrkMast.getBarcode());
+ if (Cools.isEmpty(wrkMast.getBarcode())) {
+ 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);
@@ -370,7 +381,7 @@
// 淇敼婧愬簱浣嶇姸鎬� R ===>> O
if (locMast.getLocSts().equals("R")) {
locMast.setLocSts("O");
-// locMast.setBarcode("");//鎵樼洏涓庡簱浣嶇粦瀹�
+ locMast.setBarcode("");//鎵樼洏涓庡簱浣嶇粦瀹�
locMast.setModiTime(now);
locMast.setIoTime(now);
if (!locMastService.updateById(locMast)) {
@@ -385,7 +396,8 @@
// 淇敼搴撲綅鐘舵�� R ===>> O
if (locMast.getLocSts().equals("R")) {
locMast.setLocSts("O");
-// locMast.setBarcode("");//鎵樼洏涓庡簱浣嶇粦瀹�
+ 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 0c7ff89..a3858b4 100644
--- a/src/main/java/com/zy/asrs/utils/MatExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
@@ -131,6 +131,7 @@
if (mat == null) {
mat = excel;
mat.setTagId(tagId);
+ mat.setMatnr(excel.getMatnr()+"__"+excel.getName());
if (!matService.insert(mat)) {
throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屽晢鍝佺紪鐮侊細" + excel.getMatnr());
}
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index 3a76d06..2dd0186 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -150,7 +150,7 @@
public R query(String condition) {
EntityWrapper<Mat> wrapper = new EntityWrapper<>();
wrapper.like("matnr", condition);
- Page<Mat> page = matService.selectPage(new Page<>(0, 100000), wrapper);
+ Page<Mat> page = matService.selectPage(new Page<>(0, 50), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Mat mat : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/third/erp/task/ERPItemService.java b/src/main/java/com/zy/third/erp/task/ERPItemService.java
index a6c865f..c81ec1f 100644
--- a/src/main/java/com/zy/third/erp/task/ERPItemService.java
+++ b/src/main/java/com/zy/third/erp/task/ERPItemService.java
@@ -87,7 +87,7 @@
}
mat.setStatus(1);
if(itemTB.getTemp2() != null){
- mat.setLength(Double.parseDouble(itemTB.getTemp2()));
+ mat.setLength(itemTB.getTemp2());//淇敼杩�
}
// mat.setLength(Double.parseDouble(itemTB.getTemp2()));
mat.setCreateTime(now);
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index 6cc8de5..ad70f80 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -90,8 +90,8 @@
<if test="matnr != null and matnr != ''">
and mm.matnr like concat('%',#{matnr},'%')
</if>
- <if test="maktx != null and maktx != ''">
- and mm.maktx like concat('%',#{maktx},'%')
+ <if test="name != null and name != ''">
+ and mm.name like concat('%',#{name},'%')
</if>
<if test="specs != null and specs != ''">
and mm.specs like concat('%',#{specs},'%')
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index b54fd45..8591e21 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -189,8 +189,8 @@
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', width: 200}
// ,{field: 'name', align: 'center',title: '鍒悕'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'model', 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: '鍗曚綅'}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
@@ -203,8 +203,8 @@
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
,{field: 'weight', align: 'center',title: '鎬婚噸閲�', hide: true}
- ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: false}
- ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
+ ,{field: 'length', align: 'center',title: '妯″瓟鏁�', hide: false}
+ ,{field: 'volume', align: 'center',title: '寮�妯″鍘�', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
diff --git a/src/main/webapp/static/js/pakStore/emptyOut.js b/src/main/webapp/static/js/pakStore/emptyOut.js
index 8bbc97c..36ab59e 100644
--- a/src/main/webapp/static/js/pakStore/emptyOut.js
+++ b/src/main/webapp/static/js/pakStore/emptyOut.js
@@ -51,7 +51,7 @@
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�',sort:true}
,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��',width:200}
// ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
- ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
+ ,{field: 'locType3$', align: 'center',title: '鍫嗗灈鏈哄彿'}
,{field: 'row1', align: 'center',title: '鎺�'}
,{field: 'bay1', align: 'center',title: '鍒�'}
,{field: 'lev1', align: 'center',title: '灞�'}
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 8292942..7fa0553 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -92,9 +92,9 @@
</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="maktx" class="layui-input" placeholder="杈撳叆鍟嗗搧鍚嶇О"/>
+ <input name="name" class="layui-input" placeholder="杈撳叆濂楀彿"/>
</div>
</div>
<div class="layui-inline">
@@ -213,9 +213,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="volume" placeholder="璇疯緭鍏ュ崟绠变綋绉�" class="layui-input">
+ <input name="volume" placeholder="璇疯緭鍏ュ紑妯″鍘�" class="layui-input">
</div>
</div>
@@ -244,16 +244,16 @@
</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="length" placeholder="璇疯緭鍏ュ崟绠辨瘺閲�" class="layui-input">
+ <input name="length" placeholder="璇疯緭鍏ユā瀛旀暟" class="layui-input">
</div>
</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="threeCode" placeholder="璇疯緭鍏ョ瀛愬昂瀵�" class="layui-input">
+ <input name="threeCode" placeholder="璇疯緭鍏ュ紑妯″鍘�" class="layui-input">
</div>
</div>
diff --git a/src/main/webapp/views/pakStore/emptyOut.html b/src/main/webapp/views/pakStore/emptyOut.html
index 234d821..7889257 100644
--- a/src/main/webapp/views/pakStore/emptyOut.html
+++ b/src/main/webapp/views/pakStore/emptyOut.html
@@ -96,7 +96,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="crn_no" placeholder="鍫嗗灈鏈哄彿" lay-verify="number" autocomplete="off">
+ <input class="layui-input" type="text" name="loc_type2" placeholder="搴撲綅绫诲瀷" lay-verify="number" autocomplete="off">
</div>
</div>
--
Gitblit v1.9.1