From 67826a2c51bbc013db409dd1a5e29dd4ba52fd72 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 20 一月 2026 09:27:47 +0800
Subject: [PATCH] 初始化
---
src/main/webapp/static/js/pakStore/emptyOut.js | 4
src/main/java/com/zy/asrs/controller/LocMastController.java | 59 +
src/main/resources/mapper/LocDetlMapper.xml | 3
src/main/resources/mapper/LocMastMapper.xml | 30
src/main/webapp/views/mat/mat.html | 191 +-----
src/main/webapp/views/pakStore/locDetlQuery.html | 24
src/main/webapp/views/pda/comb.html | 14
src/main/java/com/zy/common/web/WcsController.java | 12
src/main/webapp/static/js/stoMan/stoQue.js | 12
src/main/resources/mapper/AdjDetlMapper.xml | 2
src/main/java/com/zy/asrs/controller/WaitPakinController.java | 45 -
src/main/webapp/views/adjDetl/adjDetl.html | 10
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 4
src/main/webapp/static/js/adjDetl/adjDetl.js | 2
src/main/webapp/views/stoMan/stoQue.html | 18
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 145 ++--
src/main/webapp/static/js/common.js | 83 --
src/main/java/com/zy/common/service/CommonService.java | 74 ++
src/main/java/com/zy/asrs/service/MobileService.java | 4
src/main/java/com/zy/asrs/service/WrkDetlService.java | 2
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 10
src/main/webapp/views/pakStore/clampDetlQuery.html | 46 -
src/main/webapp/views/pda/index.html | 2
src/main/java/com/zy/asrs/controller/LocDetlController.java | 48 -
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 34
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 9
src/main/resources/mapper/WrkMastMapper.xml | 2
src/main/webapp/views/pda/inventory.html | 411 +++++++++++++
src/main/java/com/zy/asrs/controller/MobileController.java | 29
src/main/webapp/views/pakStore/emptyOut.html | 16
src/main/java/com/zy/common/model/LocTypeDto.java | 10
src/main/java/com/zy/common/CodeBuilder.java | 4
src/main/webapp/views/pda/matQuery.html | 11
src/main/webapp/static/js/locDetl/locDetl.js | 21
/dev/null | 132 ----
src/main/webapp/views/pda/clamp.html | 194 ++++++
src/main/webapp/static/js/waitPakin/waitPakin.js | 46 -
src/main/java/com/zy/asrs/entity/result/MobileAdjustResult.java | 2
src/main/webapp/views/waitPakin/waitPakin.html | 2
src/main/java/com/zy/asrs/service/LocMastService.java | 4
src/main/java/com/zy/asrs/entity/AdjDetl.java | 18
src/main/resources/application.yml | 2
42 files changed, 1,103 insertions(+), 688 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 8dc443a..f6a802f 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -13,9 +13,12 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.StockStatisDTO;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.ManLocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -57,27 +60,9 @@
if (!locNos.isEmpty()) {
List<LocDetl> res = new ArrayList<>();
for (String locNo : new HashSet<>(locNos)) {
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
- if (!locDetls.isEmpty()) {
- res.addAll(locDetls);
- }
- }
- return R.ok().add(res);
- }
- return R.parse(BaseRes.EMPTY);
- }
-
- @RequestMapping(value = "/locDetlOut/auth")
- @ManagerAuth
- public R stockOutListAll(@RequestParam(value = "locNos[]") List<String> locNos,@RequestParam(value = "matnrs[]",required = false) List<String> matnrs){
- if (!locNos.isEmpty()&&!matnrs.isEmpty()) {
- List<LocDetl> res = new ArrayList<>();
- for (String locNo : new HashSet<>(locNos)) {
- for (String matnr : new HashSet<>(matnrs)) {
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr",matnr).eq("loc_no",locNo));
- if (!locDetls.isEmpty()) {
- res.addAll(locDetls);
- }
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
+ if (!locDetls.isEmpty()) {
+ res.addAll(locDetls);
}
}
return R.ok().add(res);
@@ -88,27 +73,6 @@
@RequestMapping(value = "/stock/out/list/auth")
@ManagerAuth
public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- if (!Cools.isEmpty(param.get("modi_time"))){
- String val = String.valueOf(param.get("modi_time"));
- if (val.contains(RANGE_TIME_LINK)) {
- String[] dates = val.split(RANGE_TIME_LINK);
- param.put("startTime", DateUtils.convert(dates[0]));
- param.put("endTime", DateUtils.convert(dates[1]));
- param.remove("modi_time");
- }
- }
- 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 = "/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"))){
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 59bf434..ae04df8 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -23,6 +23,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import javax.validation.constraints.Size;
import java.util.*;
@RestController
@@ -222,4 +223,62 @@
locMastService.insertBatch(list);
return R.ok("鍒濆鍖栨垚鍔�");
}
+
+ @RequestMapping(value = "/locMast/list/auth/lev")
+ @ManagerAuth
+ public R listLev(@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));}
+ return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convertLev(Map<String, Object> map, EntityWrapper<T> wrapper){
+ String sizeValue = null;
+
+ // 绗竴姝ワ細鍏堝鐞唖ize鍙傛暟
+ if (map.containsKey("size")) {
+ sizeValue = String.valueOf(map.get("size"));
+ map.remove("size"); // 浠巑ap涓Щ闄わ紝閬垮厤鍚庨潰閲嶅澶勭悊
+
+ if (sizeValue.equals("2000*1500*170")){
+ wrapper.in("lev1", Arrays.asList(4, 5)).andNew().eq("crn_no", 1);
+ }else if (sizeValue.equals("1500*1500*170")){
+ wrapper.in("lev1", Arrays.asList(1, 2, 3)).andNew().eq("crn_no", 1);
+ }else if (sizeValue.equals("2600*1500*160")){
+ wrapper.in("lev1", Arrays.asList(1, 2)).andNew().eq("crn_no", 2);
+ }else if (sizeValue.equals("1300*1500*160")){
+ wrapper.in("lev1", Arrays.asList(3, 4, 5, 6)).andNew().eq("crn_no", 2);
+ }
+ }
+
+ // 绗簩姝ワ細澶勭悊鍏朵粬鍙傛暟
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String key = entry.getKey();
+ String val = String.valueOf(entry.getValue());
+
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(key, DateUtils.convert(dates[0]));
+ wrapper.le(key, DateUtils.convert(dates[1]));
+ } else if (key.equals("loc_no")){
+ wrapper.like(key, val);
+ } else {
+ wrapper.eq(key, val);
+ }
+ }
+
+ // 绗笁姝ワ細濡傛灉娌℃湁size鍙傛暟锛屽垯娣诲姞榛樿鏉′欢
+ if (sizeValue == null) {
+ wrapper.eq("loc_sts", "D");
+ } else {
+ // 濡傛灉鏈塻ize鍙傛暟锛屾坊鍔爈oc_sts != 'Y'鐨勬潯浠�
+ wrapper.and().ne("loc_sts", "Y");
+ }
+ }
}
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 07f3baa..97d35fa 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -492,11 +492,38 @@
@RequestMapping("/combMeger/auth")
@ManagerAuth(memo = "骞舵澘")
- public synchronized R adjustNewV2(@RequestBody MobileAdjustParam combParam) {
+ public synchronized R adjustNewV2(@RequestBody CombParam combParam) {
mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
return R.ok("骞舵澘鎴愬姛");
}
+ @RequestMapping("/checkDetl/auth/v2")
+ @ManagerAuth
+ public R getCheckDetlV2(@RequestParam(required = false) String barcode) {
+ if (Cools.isEmpty(barcode)) {
+ return R.ok();
+ }
+ WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
+ if (wrkMast != null && (wrkMast.getIoType() == 107 || wrkMast.getIoType() == 57)) {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ if (!Cools.isEmpty(wrkDetls)) {
+ MobileAdjustResult result = new MobileAdjustResult();
+ result.setBarcode(barcode);
+ result.setWrkNo(wrkMast.getWrkNo());
+ result.setWrkDetls(wrkDetls);
+ return R.ok().add(result);
+ }
+ }
+ return R.ok();
+ }
+
+ @RequestMapping("/inventory/auth")
+ @ManagerAuth(memo = "鐩樼偣")
+ public synchronized R inventory(@RequestBody CombParam combParam) {
+ mobileService.inventory(combParam, Boolean.TRUE, getUserId());
+ return R.ok("鐩樼偣鎴愬姛");
+ }
+
@RequestMapping("/empty/plate/out/start")
@ManagerAuth(memo = "绌烘澘鍑哄簱")
public R emptyPlateOutStart(EmptyPlateOutParam param) {
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
index 372039f..ee23c93 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
@@ -152,49 +152,4 @@
}
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);
- }
- if (waitPakin.getBarcode().length() != 8) {
- throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + waitPakin.getBarcode());
- }
- if (Integer.parseInt(waitPakin.getBarcode().substring(0,1)) < 4 || Integer.parseInt(waitPakin.getBarcode().substring(0,1)) > 8 ){
- throw new CoolException("涓嶅瓨鍦ㄧ殑鎵樼洏鐮佺被鍨�:"+waitPakin.getBarcode().substring(0,1));
- }
- 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);
- }
- if (waitPakin.getBarcode().length() != 8) {
- throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + waitPakin.getBarcode());
- }
- if (Integer.parseInt(waitPakin.getBarcode().substring(0,1)) < 4 || Integer.parseInt(waitPakin.getBarcode().substring(0,1)) > 8 ){
- throw new CoolException("涓嶅瓨鍦ㄧ殑鎵樼洏鐮佺被鍨�:"+waitPakin.getBarcode().substring(0,1));
- }
- 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/entity/AdjDetl.java b/src/main/java/com/zy/asrs/entity/AdjDetl.java
index e6a3cc0..05a2a30 100644
--- a/src/main/java/com/zy/asrs/entity/AdjDetl.java
+++ b/src/main/java/com/zy/asrs/entity/AdjDetl.java
@@ -38,6 +38,20 @@
private String locNo;
/**
+ * 鎵樼洏鏉＄爜
+ */
+ @ApiModelProperty(value= "鎵樼洏鏉＄爜")
+ @TableField("barcode")
+ private String barcode;
+
+ /**
+ * 骞舵澘鐨勫伐浣滃彿
+ */
+ @ApiModelProperty(value= "骞舵澘鐨勫伐浣滃彿")
+ @TableField("work_no")
+ private String workNo;
+
+ /**
* 鍟嗗搧缂栧彿
*/
@ApiModelProperty(value= "鍙樻洿鍟嗗搧缂栧彿")
@@ -134,8 +148,10 @@
public AdjDetl() {}
- public AdjDetl(String locNo, String matnr, String batch, Double oriCtns, Double oriQty, Double oriWt, Double adjCtns, Double adjQty, Double adjWt, String memo, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
+ public AdjDetl(String locNo, String barcode, String workNo, String matnr, String batch, Double oriCtns, Double oriQty, Double oriWt, Double adjCtns, Double adjQty, Double adjWt, String memo, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
this.locNo = locNo;
+ this.barcode = barcode;
+ this.workNo = workNo;
this.matnr = matnr;
this.batch = batch;
this.oriCtns = oriCtns;
diff --git a/src/main/java/com/zy/asrs/entity/result/MobileAdjustResult.java b/src/main/java/com/zy/asrs/entity/result/MobileAdjustResult.java
index 53616e9..3cfa6f0 100644
--- a/src/main/java/com/zy/asrs/entity/result/MobileAdjustResult.java
+++ b/src/main/java/com/zy/asrs/entity/result/MobileAdjustResult.java
@@ -11,6 +11,8 @@
@Data
public class MobileAdjustResult {
+ private String barcode;
+
private Integer staNo;
private Integer wrkNo;
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index fa4f25d..a4254f7 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -50,4 +50,8 @@
LocMast queryLocToOne(@Param("locType2") Short locType2);
LocMast queryLocToTwo(@Param("locType2") Short locType2);
+
+ LocMast queryLocToSpecal(@Param("locType1") Short locType1);
+
+ LocMast queryLocToOneEmpty(@Param("locType2") Short locType2);
}
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 1bfcb56..054d2fd 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -56,4 +56,8 @@
LocMast queryLocToOne(Short locType2);
LocMast queryLocToTwo(Short locType2);
+
+ LocMast queryLocToSpecal(Short locType1);
+
+ LocMast queryLocToOneEmpty(Short locType2);
}
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 0fde44f..885afc2 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -41,7 +41,7 @@
Double curOutQty, Integer ioType, Long userId, Date now);
- void adjustNew(MobileAdjustParam param, Boolean re, Long userId);
+ void adjustNew(CombParam param, Boolean re, Long userId);
- void combToWms(WaitPakin waitPakin);
+ void inventory(CombParam combParam, Boolean aTrue, Long userId);
}
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlService.java b/src/main/java/com/zy/asrs/service/WrkDetlService.java
index d017768..bb9b479 100644
--- a/src/main/java/com/zy/asrs/service/WrkDetlService.java
+++ b/src/main/java/com/zy/asrs/service/WrkDetlService.java
@@ -29,4 +29,6 @@
boolean updateIoTimeWms(Integer wrkNo, Date now);
List<PickInParam> selectDetByBarcode(String barcode);
+
+ boolean updateInventoryAnfme(Double anfme, Integer wrkNo, String matnr, String batch);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 62ca66e..1535a8a 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -81,6 +81,16 @@
}
@Override
+ public LocMast queryLocToSpecal(Short locType1) {
+ return this.baseMapper.queryLocToSpecal(locType1);
+ }
+
+ @Override
+ public LocMast queryLocToOneEmpty(Short locType2) {
+ return this.baseMapper.queryLocToOneEmpty(locType2);
+ }
+
+ @Override
public Boolean checkWhole(List<LocDetl> locDetls) {
return 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 6846da3..25a3c13 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -82,9 +82,6 @@
if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
-// if(param.getCombMats().size()>1){
-// throw new CoolException("璇锋彁鍙栦竴涓晢鍝侊紝鎴栬�呭埛鏂伴噸鏂扮粍鎵橈紒");
-// }
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
@@ -94,10 +91,6 @@
if (param.getBarcode().length() != 8) {
throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + param.getBarcode());
}
-// if (param.getCombMats().size()>1){
-// throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
-// }
-
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()));
@@ -128,7 +121,7 @@
for (DetlDto detlDto : detlDtos) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�---->" + detlDto.getMatnr());
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
@@ -642,21 +635,27 @@
@Override
@Transactional
- public void adjustNew(MobileAdjustParam param, Boolean re, Long userId) {
+ public void adjustNew(CombParam param, Boolean re, Long userId) {
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
if (Cools.isEmpty(wrkMast)) {
throw new CoolException("鎵樼洏鐮�:" + param.getBarcode() + " 鏃犳湁鏁堝伐浣滄。");
}
-
-
+ if (wrkMast.getWrkSts() != 14){
+ throw new CoolException("骞舵澘鏃犳晥锛屽伐浣滄。" + wrkMast.getWrkNo() + "鏈畬鎴愭垨宸插叆搴�");
+ }
+ if (wrkMast.getIoType() != 104) {
+ throw new CoolException("宸ヤ綔妗�:" + wrkMast.getWrkNo() + " 涓嶆槸骞舵澘绫诲瀷");
+ }
List<CombParam.CombMat> combMats = param.getCombMats();
- String recordRecordLog = "鎵樼洏鐮�" + param.getBarcode() + "鐩樼偣璁板綍锛�";
+ String recordRecordLog = "鎵樼洏鐮�" + param.getBarcode() + "骞舵澘璁板綍锛�";
AdjDetl adjDetl = new AdjDetl();
adjDetl.setAppeTime(new Date());
adjDetl.setAppeUser(userId);
adjDetl.setModiTime(new Date());
adjDetl.setModiUser(userId);
- adjDetl.setLocNo(wrkMast.getSourceLocNo());
+ adjDetl.setLocNo(wrkMast.getSourceLocNo()); // 搴撲綅
+ adjDetl.setBarcode( param.getBarcode()); // 鎵樼洏鐮�
+ adjDetl.setWorkNo(wrkMast.getWrkNo().toString()); //骞舵澘瀵瑰簲鐨勫伐浣滃彿
for (CombParam.CombMat wrkDetl : combMats) {
WrkDetl wrkDetlOld = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
@@ -667,84 +666,94 @@
adjDetl.setMatnr(wrkDetl.getMatnr());
-// adjDetl.setBatch(wrkDetl.getBatch());
- adjDetl.setAdjQty(wrkDetl.getAnfme());
+ adjDetl.setBatch(wrkDetl.getBatch());
+ adjDetl.setAdjQty(wrkDetl.getAnfme()); //鍙樻洿鏁伴噺
if (Cools.isEmpty(wrkDetlOld)) {
WrkDetl detl = new WrkDetl();
detl.sync(wrkDetl);
detl.setWrkNo(wrkMast.getWrkNo());
detl.setZpallet(wrkMast.getBarcode());
- detl.setIoTime(new Date());
- wrkDetlService.insert(detl);
+ detl.setIoTime(wrkMast.getIoTime()); //骞舵澘鏂板鐨勭墿鏂欎繚鎸佸師鏈夌墿鏂欑殑鏃堕棿
+ detl.setWeight(0.0); // 閲嶉噺 鍚庨潰濡傛灉闇�瑕� 鍐嶄慨鏀�
+ detl.setModiUser(userId); // 淇敼浜哄憳
+ detl.setAppeUser(userId); // 娣诲姞浜哄憳
+ wrkDetlService.insert(detl); // 鎻掑叆宸ヤ綔鏄庣粏
recordRecordLog = recordRecordLog + "\n" + "鏂板涓�鏉℃槑缁�:" + "\t鍟嗗搧缂栧彿锛�" + wrkDetl.getMatnr() + "\t鎵瑰彿锛�" + wrkDetl.getBatch() + "\t鏁伴噺锛�" + wrkDetl.getAnfme();
- adjDetl.setOriQty(0.0);
+ adjDetl.setOriQty(0.0); // 鍘熸暟閲�
adjDetlService.insert(adjDetl);
- } else if (wrkDetlOld.getAnfme() != wrkDetl.getAnfme()) {
+ }
+// else if (wrkDetlOld.getAnfme() != wrkDetl.getAnfme()) {
+// 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);
+//
+// }
+// else if (wrkDetlOld.getAnfme() == wrkDetl.getAnfme()) {
+// recordRecordLog = recordRecordLog + "\n" + "涓�鏉℃槑缁嗕繚鎸佷笉鍙�:" + "\t鍟嗗搧缂栧彿锛�" + wrkDetl.getMatnr() + "\t鎵瑰彿锛�" + wrkDetl.getBatch() + "\t鏁伴噺锛�" + wrkDetlOld.getAnfme();
+// continue;
+// }
+ else {
+// throw new CoolException("鎵樼洏鐮�:" + param.getBarcode() + " 鏈煡寮傚父锛岃鑱旂郴绠＄悊鍛�");
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());
+ recordRecordLog = recordRecordLog + "\n" + "鏇存柊涓�鏉℃槑缁�:" + "\t鍟嗗搧缂栧彿锛�" + wrkDetl.getMatnr() + "\t鎵瑰彿锛�" + wrkDetl.getBatch() + "\t鍘熸暟閲忥細" + wrkDetlOld.getAnfme() + "\t鏂板鏁伴噺锛�" + wrkDetl.getAnfme();
+ adjDetl.setOriQty(wrkDetlOld.getAnfme()); // 鍘熸暟閲�
adjDetlService.insert(adjDetl);
-
- } else if (wrkDetlOld.getAnfme() == wrkDetl.getAnfme()) {
- recordRecordLog = recordRecordLog + "\n" + "涓�鏉℃槑缁嗕繚鎸佷笉鍙�:" + "\t鍟嗗搧缂栧彿锛�" + wrkDetl.getMatnr() + "\t鎵瑰彿锛�" + wrkDetl.getBatch() + "\t鏁伴噺锛�" + wrkDetlOld.getAnfme();
- continue;
- } else {
- throw new CoolException("鎵樼洏鐮�:" + param.getBarcode() + " 鏈煡寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
}
log.info(recordRecordLog);
}
@Override
- public void combToWms(WaitPakin waitPakin) {
- 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 && wrkMast.getWrkSts() != 15)) {
- throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + waitPakin.getBarcode());
+ public void inventory(CombParam combParam, Boolean aTrue, Long userId) {
+ WrkMast wrkMast = wrkMastService.selectByBarcode(combParam.getBarcode());
+ if (Cools.isEmpty(wrkMast)) {
+ throw new CoolException("鎵樼洏鐮�:" + combParam.getBarcode() + " 鏃犳湁鏁堝伐浣滄。");
+ }
+ if (wrkMast.getWrkSts() != 14) {
+ throw new CoolException("鐩樼偣鏃犳晥锛屽伐浣滄。" + wrkMast.getWrkNo() + "鏈畬鎴愭垨宸插叆搴�");
+ }
+ if (wrkMast.getIoType() != 107) {
+ throw new CoolException("宸ヤ綔妗�:" + wrkMast.getWrkNo() + " 涓嶆槸鐩樼偣绫诲瀷");
}
- Date now = new Date();
- // 鐢熸垚鍏ュ簱閫氱煡妗�
- List<DetlDto> detlDtos = new ArrayList<>();
- Mat byId = matService.selectById(waitPakin.getModiUser());
- DetlDto detlDto = new DetlDto(byId.getMatnr(), waitPakin.getBatch(), waitPakin.getAnfme(), waitPakin.getProType(), waitPakin.getTemp2(), waitPakin.getOutOrderNo());
- detlDto.setMemo(detlDto.getMemo());
- if (DetlDto.has(detlDtos, detlDto)) {
- DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
- assert one != null;
- one.setAnfme(one.getAnfme() + detlDto.getAnfme());
- } else {
- detlDtos.add(detlDto);
+ List<CombParam.CombMat> combMats = combParam.getCombMats();
+ String recordRecordLog = "鎵樼洏鐮�" + combParam.getBarcode() + "鐩樼偣璁板綍锛�";
+
+ for (CombParam.CombMat wrkDetl : combMats) {
+ WrkDetl wrkDetlOld = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
+ .eq("wrk_no", wrkMast.getWrkNo())
+ .eq("matnr", wrkDetl.getMatnr())
+// .eq("batch",Cools.isEmpty(wrkDetl.getBatch())?"":wrkDetl.getBatch())
+ );
+
+ if (Cools.isEmpty(wrkDetlOld)) {
+ WrkDetl detl = new WrkDetl();
+ detl.sync(wrkDetl);
+ detl.setWrkNo(wrkMast.getWrkNo());
+ detl.setZpallet(wrkMast.getBarcode());
+ detl.setIoTime(wrkMast.getIoTime()); //鐩樼偣鏂板鐨勭墿鏂欎繚鎸佸師鏈夌墿鏂欑殑鏃堕棿
+ detl.setWeight(0.0); // 閲嶉噺 鍚庨潰濡傛灉闇�瑕� 鍐嶄慨鏀�
+ detl.setModiUser(userId); // 淇敼浜哄憳
+ detl.setAppeUser(userId); // 娣诲姞浜哄憳
+ wrkDetlService.insert(detl); // 鎻掑叆宸ヤ綔鏄庣粏
+ recordRecordLog = recordRecordLog + "\n" + "鏂板涓�鏉℃槑缁�:" + "\t鍟嗗搧缂栧彿锛�" + wrkDetl.getMatnr() + "\t鎵瑰彿锛�" + wrkDetl.getBatch() + "\t鏁伴噺锛�" + wrkDetl.getAnfme();
}
-
- for (DetlDto dto : detlDtos) {
- Mat mat = matService.selectByMatnr(dto.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(dto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ // 鏇存柊鏁伴噺
+ else if (!wrkDetlOld.getAnfme().equals(wrkDetl.getAnfme())) {
+ wrkDetlService.updateInventoryAnfme(wrkDetl.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+ recordRecordLog = recordRecordLog + "\n" + "鏇存柊涓�鏉℃槑缁�:" + "\t鍟嗗搧缂栧彿锛�" + wrkDetl.getMatnr() + "\t鎵瑰彿锛�" + wrkDetl.getBatch() + "\t鍘熸暟閲忥細" + wrkDetlOld.getAnfme() + "\t鏇存柊鏁伴噺锛�" + wrkDetl.getAnfme();
}
- WaitPakin waitPakin1 = new WaitPakin();
- waitPakin1.sync(mat);
- waitPakin1.setProType(dto.getProType());
- waitPakin1.setTemp2(dto.getTemp2());
- waitPakin1.setOutOrderNo(dto.getOutOrderNo());
- waitPakin1.setBatch(dto.getBatch());
- waitPakin1.setZpallet(waitPakin.getBarcode()); // 鎵樼洏鐮�
- waitPakin1.setIoStatus("N"); // 鍏ュ嚭鐘舵��
- waitPakin1.setAnfme(dto.getAnfme()); // 鏁伴噺
- waitPakin1.setStatus("Y"); // 鐘舵��
- waitPakin1.setAppeUser(waitPakin.getAppeUser());
- waitPakin1.setAppeTime(now);
- waitPakin1.setModiUser(waitPakin.getAppeUser());
- waitPakin1.setModiTime(now);
- waitPakin1.setMemo(detlDto.getMemo());
- if (!waitPakinService.insert(waitPakin1)) {
- throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+
+ // 鏁伴噺淇濇寔涓嶅彉
+ else if (wrkDetlOld.getAnfme().equals(wrkDetl.getAnfme())) {
+ recordRecordLog = recordRecordLog + "\n" + "涓�鏉℃槑缁嗕繚鎸佷笉鍙�:" + "\t鍟嗗搧缂栧彿锛�" + wrkDetl.getMatnr() + "\t鎵瑰彿锛�" + wrkDetl.getBatch() + "\t鏁伴噺锛�" + wrkDetlOld.getAnfme();
+ continue;
}
}
+ log.info(recordRecordLog);
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index dad3037..cf1cf62 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -101,4 +101,13 @@
public List<PickInParam> selectDetByBarcode(String barcode){
return this.baseMapper.selectDetByBarcode(barcode);
}
+
+ @Override
+ public boolean updateInventoryAnfme(Double anfme, Integer wrkNo, String matnr, String batch) {
+ if (anfme < 0) {
+ return this.baseMapper.deleteItem(wrkNo, matnr, batch) > 0;
+ } else {
+ return baseMapper.updateAnfme(anfme, wrkNo, matnr, batch) > 0;
+ }
+ }
}
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 e7dccc5..5d585a4 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -109,9 +109,6 @@
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
- locDetl.setModel(wrkDetl.getModel());
-
- locDetl.setTemp1(locMast.getLocType2().toString());//骞舵澘鍑哄簱鏍规嵁璐х墿绫诲瀷鍘婚�夋嫨
if (!locDetlService.insert(locDetl)) {
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
@@ -138,6 +135,9 @@
}
// 淇敼搴撲綅鐘舵�� S ====>> F
if (locMast.getLocSts().equals("S")) {
+ if (Cools.isEmpty(wrkMast.getBarcode())) {
+ throw new CoolException("鍏ュ簱鏉＄爜涓嶈兘涓虹┖");
+ }
locMast.setLocSts("F");
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
@@ -228,8 +228,6 @@
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
- locDetl.setTemp1(locMast.getLocType2().toString());//骞舵澘鍑哄簱鏍规嵁璐х墿绫诲瀷鍘婚�夋嫨
-
if (!locDetlService.insert(locDetl)) {
// exceptionHandle("骞舵澘鍏ュ簱 ===>> 鏂板搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -258,6 +256,30 @@
// exceptionHandle("鐩樼偣鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鐩樼偣鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+
+ for (WrkDetl wrkDetl : wrkDetls57) {
+ LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl);
+ if (null != locDetl) {
+ if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl)) {
+// exceptionHandle("鐩樼偣鍏ュ簱 ===>> 鏇存柊搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鐩樼偣鍏ュ簱 ===>> 鏇存柊搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ } else {
+ locDetl = new LocDetl();
+ locDetl.sync(wrkDetl);
+ locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
+ locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
+ locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
+ locDetl.setModiTime(now);
+ locDetl.setAppeTime(now);
+ if (!locDetlService.insert(locDetl)) {
+// exceptionHandle("鐩樼偣鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鐩樼偣鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ }
}
// 淇敼搴撲綅鐘舵�� Q ====>> F
if (locMast.getLocSts().equals("Q")) {
@@ -381,6 +403,7 @@
locMast.setLocSts("O");
locMast.setModiTime(now);
locMast.setIoTime(now);
+ locMast.setBarcode("");
if (!locMastService.updateById(locMast)) {
// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -394,6 +417,7 @@
if (locMast.getLocSts().equals("R")) {
locMast.setLocSts("O");
locMast.setModiTime(now);
+ locMast.setBarcode("");
locMast.setIoTime(now);
if (!locMastService.updateById(locMast)) {
// exceptionHandle("绌烘澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 99dada9..a2cd22b 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -17,10 +17,10 @@
// generator.table="sys_host";
// sqlserver
generator.sqlOsType = SqlOsType.SQL_SERVER;
- generator.url="192.168.4.15:1433;databasename=gdykasrs";
+ generator.url="127.0.0.1:1433;databasename=rqdzasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="man_auto_move";
+ generator.table="asr_adj_detl";
generator.packagePath="com.zy.asrs";
generator.build();
}
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index 8fc9892..964b55d 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -13,10 +13,10 @@
@Data
public class LocTypeDto {
- // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,5:楂樺簱浣�,2:涓簱浣�,6:瓒呴珮搴撲綅}
+ // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
private Short locType1;
- // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
+ // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣� 鎵樼洏鐮佺殑棣栦綅鏄灏� 杩欎釜瀛楁灏辨槸澶氬皯 鏍规嵁姝ゅ瓧娈靛垎閰嶅簱浣嶅埌涓嶅悓鐨勫爢鍨涙満 涓嶅悓鐨勫眰}
private Short locType2;
// 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
@@ -32,11 +32,7 @@
if (basDevp.getLocType1() == 1) {
this.locType1 = 1; // 浣庡簱浣�
} else if (basDevp.getLocType1() ==2){
- this.locType1 = 2; // 涓簱浣�
- } else if (basDevp.getLocType1() == 5){
- this.locType1 = 5; // 楂樺簱浣�
- }else if (basDevp.getLocType1() == 6){
- this.locType1 = 6;//瓒呴珮搴撲綅
+ this.locType1 = 2; // 楂樺簱浣�
}
log.info(JSON.toJSONString(this));
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 0b095ad..e747d08 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -119,7 +119,15 @@
@Transactional
public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto) {
whsType = Utils.GetWhsType(sourceStaNo);
- return getLocNoToOne(whsType, staDescId, sourceStaNo, matnr, batch, grade, 0, locTypeDto, 0);
+ StartupDto startupDto = new StartupDto();
+ if (staDescId == 1){
+ // 婊℃墭鐩樺叆搴�
+ startupDto = getLocNoToOne(whsType, staDescId, sourceStaNo, matnr, batch, grade, 0, locTypeDto, 0);
+ }else if (staDescId == 10){
+ // 绌烘墭鐩樺叆搴�
+ startupDto = getLocNoToTwo(whsType, staDescId, sourceStaNo, matnr, batch, grade, 0, locTypeDto, 0);
+ }
+ return startupDto;
}
/**
@@ -378,18 +386,76 @@
return startupDto;
}
- /*闀囨睙鎭掔珛鍗曚几绔嬪簱閫昏緫*/
+ /*闀囨睙鎭掔珛鍗曚几绔嬪簱閫昏緫 婊℃墭鐩樺叆搴�*/
@Transactional
public StartupDto getLocNoToOne(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||locTypeDto.getLocType2()==4){
- //1鍙峰贩閬� 3绉嶈揣鐗╃被鍨�
+ 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绉嶈揣鐗╃被鍨�
locMast=locMastService.queryLocToTwo(locTypeDto.getLocType2());
+
+ }else {
+ throw new CoolException("涓嶅瓨鍦ㄨ搴撲綅绫诲瀷:"+locTypeDto.getLocType2());
+ }
+ if (locMast == null){
+ throw new CoolException("鍏ュ簱娌℃湁绌哄簱浣�");
+ }
+
+ //鍫嗗灈鏈哄彿
+ Integer crnNo = locMast.getCrnNo();
+
+ //鑾峰彇鐩爣绔�
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", staDescId)
+ .eq("stn_no", sourceStaNo)
+ .eq("crn_no", crnNo);
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)){
+ log.error("鍏ュ簱璺緞涓嶅瓨鍦�,staDesc={},sourceStaNo={},crnNo={}",1,staDescId,crnNo);
+ throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ }
+
+ //妫�娴嬬洰鏍囩珯
+ BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
+ if (!staNo.getAutoing().equals("Y")){
+ throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ }
+
+ //鐢熸垚宸ヤ綔鍙�
+ int workNo = getWorkNo(0);
+
+ //杩斿洖dto
+ StartupDto startupDto =new StartupDto();
+ startupDto.setWorkNo(workNo);
+ startupDto.setLocNo(locMast.getLocNo());
+ startupDto.setStaNo(staNo.getDevNo());
+ startupDto.setCrnNo(crnNo);
+ startupDto.setSourceStaNo(sourceStaNo);
+ return startupDto;
+ }
+
+ /*闀囨睙鎭掔珛鍗曚几绔嬪簱閫昏緫 绌烘墭鐩樺叆搴�*/
+ @Transactional
+ 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());
+
+ }else if (locTypeDto.getLocType2()==7||locTypeDto.getLocType2()==8){
+ //2鍙峰贩閬� 2绉嶈揣鐗╃被鍨�
+ locMast=locMastService.queryLocToTwo(locTypeDto.getLocType2());
+
}else {
throw new CoolException("涓嶅瓨鍦ㄨ搴撲綅绫诲瀷:"+locTypeDto.getLocType2());
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index f25d588..f6c7e8e 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -108,15 +108,13 @@
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
if (param.getBarcode().startsWith("5")){
- locTypeDto.setLocType2((short) 5);
+ locTypeDto.setLocType2((short) 5); // 2000*1500*170 1宸烽亾 4銆�5灞�
}else if (param.getBarcode().startsWith("6")){
- locTypeDto.setLocType2((short) 6);
+ locTypeDto.setLocType2((short) 6); // 1500*1500*170(鏈変袱绉� 鎵樼洏涓�鏍� 杞介噸涓嶄竴鏍� 闇�瑕佸崟鐙牴鎹� 鎵樼洏鐮� + 楂樹綆 鏉ュ啓鍒嗗簱浣嶇殑閫昏緫) 1宸烽亾 1銆�2銆�3灞�
}else if (param.getBarcode().startsWith("7")){
- locTypeDto.setLocType2((short) 7);
+ locTypeDto.setLocType2((short) 7); // 2600*1500*160 2宸烽亾 1銆�2灞�
}else if (param.getBarcode().startsWith("8")){
- locTypeDto.setLocType2((short) 8);
- }else if (param.getBarcode().startsWith("4")){
- locTypeDto.setLocType2((short) 4);
+ locTypeDto.setLocType2((short) 8); // 1300*1500*160 2宸烽亾 3銆�4銆�5銆�6灞�
}else {
return R.error("鏉＄爜瑙勫垯涓嶅瓨鍦�:"+param.getBarcode());
}
@@ -125,7 +123,7 @@
switch (param.getIoType()) {
case 1://婊℃墭鐩樺叆搴�
assert waitPakins != null;
- dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(),param.getWeight(), locTypeDto, waitPakins);
+ dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), param.getWeight(), locTypeDto, waitPakins);
break;
case 10://绌烘墭鐩樺叆搴�
dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0a3ba90..b728e2a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -33,7 +33,7 @@
logging:
- path: /stock/out/@pom.build.finalName@/logs
+ path: ./stock/out/@pom.build.finalName@/logs
super:
pwd: xltys1995
diff --git a/src/main/resources/mapper/AdjDetlMapper.xml b/src/main/resources/mapper/AdjDetlMapper.xml
index 2aafe74..1bfe7db 100644
--- a/src/main/resources/mapper/AdjDetlMapper.xml
+++ b/src/main/resources/mapper/AdjDetlMapper.xml
@@ -6,6 +6,8 @@
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.AdjDetl">
<id column="adj_id" property="adjId" />
<result column="loc_no" property="locNo" />
+ <result column="barcode" property="barcode" />
+ <result column="work_no" property="workNo" />
<result column="matnr" property="matnr" />
<result column="matnr_old" property="matnrOld" />
<result column="batch" property="batch" />
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 1ea5ec3..be9dcd9 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -152,6 +152,7 @@
update asr_loc_detl
set anfme = #{anfme}
, modi_time = getdate()
+ , appe_time = getdate()
where 1=1
and loc_no = #{locNo}
and matnr = #{locDetl.matnr}
@@ -244,7 +245,7 @@
select * from
(
select
- ROW_NUMBER() over (order by a.appe_time,a.matnr,a.loc_no) as row,
+ ROW_NUMBER() over (order by a.modi_time, a.loc_no) as row,
a.*
from asr_loc_detl a
left join asr_loc_mast b on a.loc_no = b.loc_no
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 1b36b39..1efab2e 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -123,13 +123,7 @@
<select id="queryLocToOne" resultMap="BaseResultMap">
select top 1 * from asr_loc_mast
where loc_sts = 'O' and row1 in (1,2)
- <if test="locType2 == 4">
- and lev1 in(1)
- </if>
<if test="locType2 == 5">
- and lev1 in(2,3)
- </if>
- <if test="locType2 == 6">
and lev1 in(4,5)
</if>
order by lev1 asc,bay1 asc
@@ -146,4 +140,28 @@
</if>
order by lev1 asc,bay1 asc
</select>
+
+ <select id="queryLocToSpecal" resultMap="BaseResultMap">
+ select top 1 * from asr_loc_mast
+ where loc_sts = 'O' and row1 in (1,2)
+ <if test="locType1 == 1">
+ and lev1 in(1)
+ </if>
+ <if test="locType1 == 2">
+ and lev1 in(2,3)
+ </if>
+ order by lev1 asc,bay1 asc
+ </select>
+
+ <select id="queryLocToOneEmpty" resultMap="BaseResultMap">
+ select top 1 * from asr_loc_mast
+ where loc_sts = 'O' and row1 in (1,2)
+ <if test="locType2 == 5">
+ and lev1 in(4,5)
+ </if>
+ <if test="locType2 == 6">
+ and lev1 in(1,2,3)
+ </if>
+ order by lev1 asc,bay1 asc
+ </select>
</mapper>
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index ae19ba0..afc2238 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -70,7 +70,7 @@
select * from asr_wrk_mast
where wrk_sts=5
or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
- or (wrk_sts=15 and dateadd(mi,5,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=15 and dateadd(mi,1,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
order by io_time,wrk_no asc
</select>
diff --git a/src/main/webapp/static/js/adjDetl/adjDetl.js b/src/main/webapp/static/js/adjDetl/adjDetl.js
index 1fe7723..5789a32 100644
--- a/src/main/webapp/static/js/adjDetl/adjDetl.js
+++ b/src/main/webapp/static/js/adjDetl/adjDetl.js
@@ -22,6 +22,8 @@
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
// {field: 'adjId', align: 'center',title: '搴忓彿'}
{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'barcode', align: 'center',title: '鎵樼洏鏉＄爜'}
+ ,{field: 'workNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'matnrOld', align: 'center',title: '鍘熷搧鍙�'}
,{field: 'matnr', align: 'center',title: '褰撳墠鍝佸彿'}
,{field: 'batch', align: 'center',title: '鎵瑰彿'}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 21cdd34..7513e3a 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -186,14 +186,13 @@
// ,{field: 'uuid', align: 'center',title: '缂栧彿'}
// ,{field: 'tagId$', align: 'center',title: '鎵�灞炲綊绫�'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
- // ,{field: 'name', align: 'center',title: '鍒悕'}
+ ,{field: 'name', align: 'center',title: '鍒悕'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{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}
- ,{field: 'sku', align: 'center',title: '鏉愯川', hide: true}
+ ,{field: 'sku', align: 'center',title: 'sku', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
@@ -201,10 +200,10 @@
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{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: true}
- ,{field: 'volume', align: 'center',title: '寮�妯″鍘�', hide: true}
- ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
+ ,{field: 'weight', align: 'center',title: '閲嶉噺', hide: true}
+ ,{field: 'length', align: 'center',title: '闀垮害', hide: true}
+ ,{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}
,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
@@ -219,10 +218,10 @@
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
- ,{field: 'proType', align: 'center',title: '灞炴��', hide: false}
- ,{field: 'temp1', align: 'center',title: '鍚嶇О鎬荤О', hide: true}
- ,{field: 'outOrderNo', align: 'center',title: '鍚堝悓鍙�', hide: true}
- ,{field: 'temp2', align: 'center',title: '瀹㈡埛鍥惧彿', hide: true}
+// ,{field: 'proType', align: 'center',title: '灞炴��', hide: true}
+// ,{field: 'temp1', align: 'center',title: 'temp1', hide: true}
+// ,{field: 'outOrderNo', align: 'center',title: '鍚堝悓鍙�', hide: true}
+// ,{field: 'temp2', align: 'center',title: 'temp2', hide: true}
]
@@ -231,7 +230,7 @@
{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: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'spgNO', align: 'center',title: '娲惧伐鍗曞彿', hide:true,sort:true}
,{field: 'batch', align: 'center',title: '鎵规', hide:true,sort:true}
,{field: 'outOrderNo', align: 'center',title: '鍚堝悓鍙�', sort:true, hide: true}
@@ -242,7 +241,7 @@
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: '鏉愯川', hide: true}
+ ,{field: 'sku', align: 'center',title: 'sku', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
@@ -250,11 +249,11 @@
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{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: true}
- ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
- ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
- ,{field: 'supp', align: 'center',title: '瀹㈡埛鍚嶇О', hide:false }
+ ,{field: 'weight', align: 'center',title: '閲嶉噺', hide: true}
+ ,{field: 'length', align: 'center',title: '闀垮害', hide: true}
+ ,{field: 'volume', align: 'center',title: '浣撶Н', hide: true}
+ ,{field: 'threeCode', align: 'center',title: '涓夋柟缂栫爜', hide: true}
+ ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide:false }
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
@@ -262,50 +261,8 @@
,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
- ,{field: 'proType', align: 'center',title: '灞炴��', hide: false}
- ,{field: 'temp1', align: 'center',title: '鍚嶇О鎬荤О', hide: true}
- ,{field: 'temp2', align: 'center',title: '瀹㈡埛鍥惧彿', hide: true}
-
-]
-
-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: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
- ,{field: 'spgNO', align: 'center',title: '娲惧伐鍗曞彿', hide:true,sort:true}
- ,{field: 'batch', align: 'center',title: '鎵规', hide:true,sort:true}
- ,{field: 'outOrderNo', align: 'center',title: '鍚堝悓鍙�', sort:true, hide: true}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false}
- ,{field: 'anfme', align: 'center',title: '缁戝畾鏁伴噺', hide: false}
- ,{field: 'specs', align: 'center',title: '瑙勬牸', hide: true}
- ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
- ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
- ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: '鏉愯川', hide: true}
- ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
- ,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
- ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
- ,{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: true}
- ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
- ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
- ,{field: 'price', align: 'center',title: '鍙斁鏁伴噺', hide:false }
- ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
- ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
- ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
- ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
- ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
- ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
- ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
- ,{field: 'proType', align: 'center',title: '灞炴��', hide: true}
- ,{field: 'temp1', align: 'center',title: '鍚嶇О鎬荤О', hide: true}
- ,{field: 'temp2', align: 'center',title: '瀹㈡埛鍥惧彿', hide: true}
-
+// ,{field: 'proType', align: 'center',title: '灞炴��', hide: false}
+// ,{field: 'temp1', align: 'center',title: 'temp1', hide: true}
+// ,{field: 'temp2', align: 'center',title: 'temp2', hide: true}
]
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index a2c8d30..87a177c 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -17,15 +17,6 @@
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- //,{fixed: 'right', title:'绠�鍥�', align: 'center', toolbar: '#operate1', width: 300}
- // ,{fixed: 'right', align: 'center',title: '绠�鍥�', templet:function(row){
- // var html = "<img src='http://127.0.0.1:8080/czkhasrs/previewImage?maktx=" +row.maktx+"'/>";
- // return html;
- // }}
- /*,{fixed: 'right', align: 'center', title: '绠�鍥�', templet: function(row){
- var html = "<a href='http://127.0.0.1:8080/czkhasrs/previewImage?maktx=" + row.maktx + "' target='_blank' rel='noopener noreferrer'>鏌ョ湅绠�鍥�</a>";
- return html;
- }}*/
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
@@ -33,10 +24,10 @@
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{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: true}
- ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
- ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
+ ,{field: 'weight', align: 'center',title: '閲嶉噺', hide: true}
+ ,{field: 'length', align: 'center',title: '闀垮害', hide: true}
+ ,{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}
,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
@@ -46,8 +37,8 @@
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
,{field: 'proType', align: 'center',title: '灞炴��', hide: false}
- ,{field: 'temp1', align: 'center',title: '鍚嶇О鎬荤О', hide: true}
- ,{field: 'temp2', align: 'center',title: '瀹㈡埛鍥惧彿', hide: true}
+// ,{field: 'temp1', align: 'center',title: 'temp1', hide: true}
+// ,{field: 'temp2', align: 'center',title: 'temp2', hide: true}
];
diff --git a/src/main/webapp/static/js/matInOut/matInOut_old.js b/src/main/webapp/static/js/matInOut/matInOut_old.js
deleted file mode 100644
index a7a944b..0000000
--- a/src/main/webapp/static/js/matInOut/matInOut_old.js
+++ /dev/null
@@ -1,567 +0,0 @@
-var pageCurr;
-function getCol() {
- 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: 'model', align: 'center',title: '浠ｇ爜', hide: 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}
- ,{field: 'outOrderNo', align: 'center',title: '鍚堝悓鍙�'}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺',hide: true}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜',hide: true}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
- ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
- ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'color', align: 'center',title: '鐘舵��', hide: false}
- ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
- ,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
- ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
- ,{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: true}
- ,{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}
- ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
- ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
- ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
- ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
- ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
- ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
- ,{field: 'temp1', align: 'center',title: '灞炴��', hide: false}
- ,{field: 'temp1', align: 'center',title: '鍚嶇О鎬荤О', hide: true}
- ,{field: 'temp2', align: 'center',title: '瀹㈡埛鍥惧彿', hide: true}
-
- ];
-
- // cols.push.apply(cols, detlCols);
- cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
- )
- return cols;
-}
-
-layui.use(['table','laydate', 'form'], function(){
- var table = layui.table;
- var $ = layui.jquery;
- var layer = layui.layer;
- var layDate = layui.laydate;
- var form = layui.form;
-
- // 鏁版嵁娓叉煋
- tableIns = table.render({
- elem: '#locDetl',
- headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/matInOut/list/auth',
- page: true,
- limit: 16,
- limits: [16, 30, 50, 100, 200, 500],
- even: true,
- toolbar: '#toolbar',
- cellMinWidth: 50,
- cols: [getCol()],
- 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;
- 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('sort(locDetl)', function (obj) {
- var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- searchData[this.name] = this.value;
- });
- searchData['orderByField'] = obj.field;
- searchData['orderByType'] = obj.type;
- tableIns.reload({
- where: searchData,
- page: {
- curr: 1
- },
- done: function (res, curr, count) {
- if (res.code === 403) {
- top.location.href = baseUrl+"/";
- }
- pageCurr=curr;
- limit();
- }
- });
- });
-
- // 鐩戝惉澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(locDetl)', function (obj) {
- var checkStatus = table.checkStatus(obj.config.id);
- switch(obj.event) {
- case 'addData':
- layer.open({
- type: 2,
- title: '鏂板',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
- content: 'locDetl_detail.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 'refreshData':
- tableIns.reload({
- page: {
- curr: pageCurr
- }
- });
- limit();
- break;
- case 'deleteData':
- var data = checkStatus.data;
- if (data.length === 0){
- layer.msg('璇烽�夋嫨鏁版嵁');
- } else {
- layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
- $.ajax({
- url: baseUrl+"/locDetl/delete/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {param: JSON.stringify(data)},
- method: 'POST',
- traditional:true,
- success: function (res) {
- if (res.code === 200){
- layer.closeAll();
- tableReload(false);
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- } else {
- layer.msg(res.msg)
- }
- }
- })
- });
- }
- break;
- case 'exportData':
- layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
- var titles=[];
- var fields=[];
- obj.config.cols[0].map(function (col) {
- if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
- titles.push(col.title);
- fields.push(col.field);
- }
- });
- var exportData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- exportData[this.name] = this.value;
- });
- var param = {
- 'locDetl': exportData,
- 'fields': fields
- };
- var loadIndex = layer.msg('姝ｅ湪瀵煎嚭...', {icon: 16, shade: 0.01, time: false});
- $.ajax({
- url: baseUrl+"/locDetl/export/auth",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify(param),
- dataType:'json',
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- success: function (res) {
- layer.close(loadIndex);
- layer.closeAll();
- if (res.code === 200) {
- table.exportFile(titles,res.data,'xls');
- } else if (res.code === 403) {
- top.location.href = baseUrl+"/";
- } else {
- layer.msg(res.msg)
- }
- }
- });
- });
- break;
- }
- });
-
- // 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(locDetl)', function(obj){
- var data = obj.data;
- switch (obj.event) {
- // 璇︽儏
- case 'detail':
- layer.open({
- type: 2,
- title: '璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
- content: 'locDetl_detail.html',
- success: function(layero, index){
- setFormVal(layer.getChildFrame('#detail', index), 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');
- }
- });
- break;
- // 缂栬緫
- case 'edit':
- layer.open({
- type: 2,
- title: '淇敼',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
- content: 'locDetl_detail.html',
- success: function(layero, index){
- layer.getChildFrame('#data-detail-submit-save', index).hide();
- setFormVal(layer.getChildFrame('#detail', index), data, false);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
- top.convertDisabled(layer.getChildFrame('#locNo,#matnr', index), true);
- 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');
- }
- });
- break;
- case 'locNo':
- var param = top.reObject(data).locNo;
- 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)
- }
- }
- })
- }
- });
- }
- break;
- case 'modiUser':
- var param = top.reObject(data).modiUser;
- 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)
- }
- }
- })
- }
- });
- }
- break;
- case 'appeUser':
- var param = top.reObject(data).appeUser;
- 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)
- }
- }
- })
- }
- });
- }
- break;
-
- }
- });
-
- // 鏁版嵁淇濆瓨鍔ㄤ綔
- form.on('submit(save)', function () {
- if (banMsg != null){
- layer.msg(banMsg);
- return;
- }
- method("add");
- });
-
- // 鏁版嵁淇敼鍔ㄤ綔
- form.on('submit(edit)', function () {
- method("update")
- });
-
- function method(name){
- var index = layer.load(1, {
- shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙
- });
- var data = {
-// id: $('#id').val(),
- locNo: $('#locNo').val(),
- matnr: $('#matnr').val(),
- lgnum: $('#lgnum').val(),
- tbnum: $('#tbnum').val(),
- tbpos: $('#tbpos').val(),
- zmatid: $('#zmatid').val(),
- maktx: $('#maktx').val(),
- werks: $('#werks').val(),
- anfme: $('#anfme').val(),
- altme: $('#altme').val(),
- zpallet: $('#zpallet').val(),
- bname: $('#bname').val(),
- memo: $('#memo').val(),
- modiUser: $('#modiUser').val(),
- modiTime: top.strToDate($('#modiTime\\$').val()),
- appeUser: $('#appeUser').val(),
- appeTime: top.strToDate($('#appeTime\\$').val()),
-
- };
- $.ajax({
- url: baseUrl+"/locDetl/"+name+"/auth",
- headers: {'token': localStorage.getItem('token')},
- data: top.reObject(data),
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- parent.layer.closeAll();
- parent.$(".layui-laypage-btn")[0].click();
- $("#data-detail :input").each(function () {
- $(this).val("");
- });
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- layer.close(index);
- }
- })
- }
-
- // 澶嶉�夋浜嬩欢
- form.on('checkbox(detailCheckbox)', function (data) {
- var el = data.elem;
- if (el.checked) {
- $(el).val('Y');
- } else {
- $(el).val('N');
- }
- });
-
- // 鎼滅储鏍忔悳绱簨浠�
- form.on('submit(search)', function (data) {
- pageCurr = 1;
- tableReload(false);
- });
-
-
- // 鎼滅储鏍忛噸缃簨浠�
- form.on('submit(reset)', function (data) {
- pageCurr = 1;
- clearFormVal($('#search-box'));
- tableReload(false);
- });
- layDate.render({
- elem: '.layui-laydate-range'
- ,type: 'datetime'
- ,range: true
- });
- // 鏃堕棿閫夋嫨鍣�
- layDate.render({
- elem: '#modiTime\\$',
- type: 'datetime'
- });
- layDate.render({
- elem: '#appeTime\\$',
- type: 'datetime'
- });
-
-
-});
-
-// 鍏抽棴鍔ㄤ綔
-$(document).on('click','#data-detail-close', function () {
- parent.layer.closeAll();
-});
-
-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);
- }
- });
-}
-
-function setFormVal(el, data, showImg) {
- for (var val in data) {
- var find = el.find(":input[id='" + val + "']");
- if (find[0]!=null){
- if (find[0].type === 'checkbox'){
- if (data[val]==='Y'){
- find.attr("checked","checked");
- find.val('Y');
- } else {
- find.remove("checked");
- find.val('N');
- }
- continue;
- }
- }
- find.val(data[val]);
- if (showImg){
- var next = find.next();
- if (next.get(0)){
- if (next.get(0).localName === "img") {
- find.hide();
- next.attr("src", data[val]);
- next.show();
- }
- }
- }
- }
-}
-
-function clearFormVal(el) {
- $(':input', el)
- .val('')
- .removeAttr('checked')
- .removeAttr('selected');
-}
-
-function detailScreen(index) {
- var detail = layer.getChildFrame('#data-detail', index);
- var height = detail.height()+60;
- if (height > ($(window).height()*0.9)) {
- height = ($(window).height()*0.8);
- }
- layer.style(index, {
-// top: (($(window).height()-height)/3)+"px",
- height: height+'px'
- });
-}
-
-$('body').keydown(function () {
- if (event.keyCode === 13) {
- $("#search").click();
- }
-});
\ No newline at end of file
diff --git a/src/main/webapp/static/js/pakStore/emptyOut.js b/src/main/webapp/static/js/pakStore/emptyOut.js
index d3e0c09..a5e5b5e 100644
--- a/src/main/webapp/static/js/pakStore/emptyOut.js
+++ b/src/main/webapp/static/js/pakStore/emptyOut.js
@@ -37,7 +37,7 @@
tableIns = table.render({
elem: '#locMast',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/locMast/list/auth',
+ url: baseUrl+'/locMast/list/auth/lev',
page: true,
limit: 16,
limits: [16, 30, 50, 100, 200, 500],
@@ -51,7 +51,7 @@
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�',sort:true}
,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��',width:200}
// ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
- ,{field: 'locType2$', align: 'center',title: '鎵樼洏绫诲瀷'}
+ ,{field: 'barcode', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
,{field: 'row1', align: 'center',title: '鎺�'}
,{field: 'bay1', align: 'center',title: '鍒�'}
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index 883f0c3..c1b987b 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -33,12 +33,12 @@
,{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' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
- if(row.fullPlt === 'Y'){html += " checked ";}
- html += "disabled='disabled' >";
- return html;
- },width:80}
+ // ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
+ // var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
+ // if(row.fullPlt === 'Y'){html += " checked ";}
+ // html += "disabled='disabled' >";
+ // return html;
+ // },width:80}
,{field: 'barcode', align: 'center',title: '鏉＄爜鍙�'}
,{field: 'locType1$', align: 'center',title: '澶у皬绫诲瀷'}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
diff --git a/src/main/webapp/static/js/waitPakin/waitPakin.js b/src/main/webapp/static/js/waitPakin/waitPakin.js
index 1cbf059..4027f58 100644
--- a/src/main/webapp/static/js/waitPakin/waitPakin.js
+++ b/src/main/webapp/static/js/waitPakin/waitPakin.js
@@ -169,34 +169,6 @@
});
}
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=[];
@@ -363,24 +335,6 @@
return;
}
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");
});
// 鏁版嵁淇敼鍔ㄤ綔
diff --git a/src/main/webapp/views/adjDetl/adjDetl.html b/src/main/webapp/views/adjDetl/adjDetl.html
index 5c77216..db6a72f 100644
--- a/src/main/webapp/views/adjDetl/adjDetl.html
+++ b/src/main/webapp/views/adjDetl/adjDetl.html
@@ -21,6 +21,16 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
+ <input class="layui-input" type="text" name="barcode" placeholder="鎵樼洏鏉＄爜" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="work_no" placeholder="宸ヤ綔鍙�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<input class="layui-input" type="text" name="matnr" placeholder="褰撳墠鍝佸彿" autocomplete="off">
</div>
</div>
diff --git a/src/main/webapp/views/barcodeMatnr/barcodeMatnr.html b/src/main/webapp/views/barcodeMatnr/barcodeMatnr.html
deleted file mode 100644
index c177e88..0000000
--- a/src/main/webapp/views/barcodeMatnr/barcodeMatnr.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!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="search-box" class="layui-form layui-card-header">
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鏉＄爜" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栫爜" autocomplete="off">
- </div>
- </div>
- <!-- 鏃ユ湡鑼冨洿 -->
-<!-- <div class="layui-inline" style="width: 300px">-->
-<!-- <div class="layui-input-inline">-->
-<!-- <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">-->
-<!-- </div>-->
-<!-- </div>-->
- <!-- 寰呮坊鍔� -->
- <div id="data-search-btn" class="layui-btn-container layui-form-item">
- <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>
-
-<!-- 琛ㄦ牸 -->
-<div class="layui-form">
- <table class="layui-hide" id="waitPakin" lay-filter="waitPakin"></table>
-</div>
-<script type="text/html" id="toolbar">
- <div class="layui-btn-container">
- <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-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>
-
-<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
- <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</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>
-<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/barcodeMatnr/barcodeMatnr.js" charset="utf-8"></script>
-<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
-</body>
-</html>
-
diff --git a/src/main/webapp/views/barcodeMatnr/barcodeMatnr_clamp.html b/src/main/webapp/views/barcodeMatnr/barcodeMatnr_clamp.html
deleted file mode 100644
index 12c28f2..0000000
--- a/src/main/webapp/views/barcodeMatnr/barcodeMatnr_clamp.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!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="save2">淇濆瓨</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/barcodeMatnr/barcodeMatnr.js" charset="utf-8"></script>
-</html>
-
diff --git a/src/main/webapp/views/barcodeMatnr/barcodeMatnr_comb.html b/src/main/webapp/views/barcodeMatnr/barcodeMatnr_comb.html
deleted file mode 100644
index a7ba0bc..0000000
--- a/src/main/webapp/views/barcodeMatnr/barcodeMatnr_comb.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!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="save1">淇濆瓨</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/barcodeMatnr/barcodeMatnr.js" charset="utf-8"></script>
-</html>
-
diff --git a/src/main/webapp/views/barcodeMatnr/barcodeMatnr_detail.html b/src/main/webapp/views/barcodeMatnr/barcodeMatnr_detail.html
deleted file mode 100644
index 2eef65f..0000000
--- a/src/main/webapp/views/barcodeMatnr/barcodeMatnr_detail.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!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>aitPakin/list-->
-<!-- <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="save">淇濆瓨</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/barcodeMatnr/barcodeMatnr.js" charset="utf-8"></script>
-</html>
-
diff --git a/src/main/webapp/views/halfBarcode/halfBarcode_old.html b/src/main/webapp/views/halfBarcode/halfBarcode_old.html
deleted file mode 100644
index c9e40e8..0000000
--- a/src/main/webapp/views/halfBarcode/halfBarcode_old.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!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="search-box" class="layui-form layui-card-header">
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鏉＄爜" autocomplete="off">
- </div>
- </div>
-<!-- <div class="layui-inline">-->
-<!-- <div class="layui-input-inline">-->
-<!-- <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡缂栧彿" autocomplete="off">-->
-<!-- </div>-->
-<!-- </div>-->
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="specs" placeholder="鎵樼洏瑙勬牸" autocomplete="off">
- </div>
- </div>
- <!-- 鏃ユ湡鑼冨洿 -->
- <!-- <div class="layui-inline" style="width: 300px">-->
- <!-- <div class="layui-input-inline">-->
- <!-- <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">-->
- <!-- </div>-->
- <!-- </div>-->
- <!-- 寰呮坊鍔� -->
- <div id="data-search-btn" class="layui-btn-container layui-form-item">
- <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>
-
-<!-- 琛ㄦ牸 -->
-<div class="layui-form">
- <table class="layui-hide" id="waitPakin" lay-filter="waitPakin"></table>
-</div>
-<!--<script type="text/html" id="toolbar">-->
-<!-- <div class="layui-btn-container">-->
-<!-- <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-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>-->
-
-<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
- <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</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>
-<script type="text/javascript" src="../../static/js/cool.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/mat/mat.html b/src/main/webapp/views/mat/mat.html
index cbcc05f..a1225c5 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="maktx" class="layui-input" placeholder="杈撳叆鍟嗗搧鍚嶇О"/>
</div>
</div>
<div class="layui-inline">
@@ -128,8 +128,6 @@
<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>-->
- <li style="display: none"><input id="importImage" type="file" onchange="uploadImage(this)" ></li>
<!-- 鍟嗗搧/鐗╂枡 鏁版嵁涓績 -->
<div class="dropdown-menu" style="float: right">
<button class="layui-btn layui-btn-primary layui-border-black icon-btn layui-btn-sm"> 鏁版嵁鍚屾 <i class="layui-icon layui-icon-drop"></i></button>
@@ -150,7 +148,6 @@
<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>-->
<button class="layui-btn layui-btn-xs btn-print" lay-event="btnPrint">鎵撳嵃</button>
</script>
@@ -202,184 +199,56 @@
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍟嗗搧缂栫爜</label>
- <div class="layui-input-block">
- <input name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鐮�" class="layui-input">
- </div>
- </div>
-
- <div class="layui-form-item">
- <label class="layui-form-label">鍨嬪彿</label>
- <div class="layui-input-block">
- <input name="name" placeholder="璇疯緭鍏ュ瀷鍙�" class="layui-input">
- </div>
- </div>
-
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label">寮�妯″鍘�</label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input name="volume" placeholder="璇疯緭鍏ュ紑妯″鍘�" class="layui-input">-->
-<!-- </div>-->
-<!-- </div>-->
-
- </div>
-
- <div class="layui-col-md6">
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label layui-form-required">妯″叿鍚嶇О</label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input id="matnr" name="matnr" placeholder="璇疯緭鍏ユā鍏峰悕绉�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">-->
-<!-- </div>-->
-<!-- </div>-->
-
- <div class="layui-form-item">
<label class="layui-form-label">瑙勬牸</label>
<div class="layui-input-block">
- <input name="specs" placeholder="璇疯緭鍏ヤ唬鐮�" class="layui-input">
- </div>
- </div>
-
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label">澶囨敞</label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">-->
-<!-- </div>-->
-<!-- </div>-->
-
- <div class="layui-form-item">
- <label class="layui-form-label">棰滆壊</label>
- <div class="layui-input-block">
- <input name="color" placeholder="棰滆壊" class="layui-input">
- </div>
- </div>
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label">棰滆壊</label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <select id="color" name="color" lay-filter="color" placeholder="璇烽�夋嫨鐘舵��">-->
-<!-- <option value="">璇烽�夋嫨鐘舵��</option>-->
-<!-- <option value="姝ｅ父" name="color" class="layui-input">姝ｅ父</option>-->
-<!-- <option value="鎶ュ簾" name="color" class="layui-input">鎶ュ簾</option>-->
-<!-- </select>-->
-<!-- </div>-->
-<!-- </div>-->
-
- </div>
- </div>
- <hr class="layui-bg-gray">
- <div class="layui-form-item text-right">
- <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
- <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
- </div>
- </form>
-</script>
-
-
-
-<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="editDialogBarcode">
- <form id="detailBarcode" lay-filter="detail" class="layui-form admin-form">
- <input name="id" type="hidden">
- <input name="uuid" type="hidden">
- <input name="nodeId" type="hidden">
- <input name="tag_id" type="hidden">
- <input name="model" type="hidden">
- <input name="name" type="hidden">
- <input name="batch" type="hidden">
- <input name="docId" type="hidden">
- <input name="docNum" type="hidden">
- <input name="custName" type="hidden">
- <input name="itemNum" type="hidden">
- <input name="count" type="hidden">
- <input name="weight" type="hidden">
- <input name="status" type="hidden">
- <input name="createBy" type="hidden">
- <input name="updateTime$" type="hidden">
- <input name="updateBy" type="hidden">
- <div class="layui-row">
-
- <div class="layui-col-md6">
-
- <div class="layui-form-item">
- <label class="layui-form-label">鍒嗙被</label>
- <div class="layui-input-block">
- <div id="tagSelBarcode" class="ew-xmselect-tree"></div>
+ <input name="specs" placeholder="璇疯緭鍏ヨ鏍�" class="layui-input">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鍨嬫潗鍨嬪彿</label>
+ <label class="layui-form-label">閲嶉噺</label>
<div class="layui-input-block">
- <input name="maktx" placeholder="璇疯緭鍏ュ瀷鏉愬瀷鍙�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ <input name="weight" 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="matnr" placeholder="璇疯緭鍏ユā鍏峰悕绉�" class="layui-input">
+ <input name="volume" placeholder="璇疯緭鍏ヤ綋绉�" class="layui-input">
</div>
</div>
-
- <div class="layui-form-item">
- <label class="layui-form-label">鍨嬪彿</label>
- <div class="layui-input-block">
- <input name="name" placeholder="璇疯緭鍏ュ瀷鍙�" class="layui-input">
- </div>
- </div>
-
- <!-- <div class="layui-form-item">-->
- <!-- <label class="layui-form-label">寮�妯″鍘�</label>-->
- <!-- <div class="layui-input-block">-->
- <!-- <input name="volume" placeholder="璇疯緭鍏ュ紑妯″鍘�" class="layui-input">-->
- <!-- </div>-->
- <!-- </div>-->
</div>
<div class="layui-col-md6">
- <!-- <div class="layui-form-item">-->
- <!-- <label class="layui-form-label layui-form-required">妯″叿鍚嶇О</label>-->
- <!-- <div class="layui-input-block">-->
- <!-- <input id="matnr" name="matnr" placeholder="璇疯緭鍏ユā鍏峰悕绉�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">-->
- <!-- </div>-->
- <!-- </div>-->
-
<div class="layui-form-item">
- <label class="layui-form-label">瑙勬牸</label>
+ <label class="layui-form-label layui-form-required">鍟嗗搧缂栧彿</label>
<div class="layui-input-block">
- <input name="specs" placeholder="璇疯緭鍏ヤ唬鐮�" class="layui-input">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鎵樼洏鐮�</label>
- <div class="layui-input-block">
- <input name="unit" placeholder="璇疯緭鍏ユ墭鐩樼爜" class="layui-input">
+ <input id="matnr" name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鍙�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
</div>
</div>
- <!-- <div class="layui-form-item">-->
- <!-- <label class="layui-form-label">澶囨敞</label>-->
- <!-- <div class="layui-input-block">-->
- <!-- <input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">-->
- <!-- </div>-->
- <!-- </div>-->
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-block">
+ <input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
+ </div>
+ </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鐘舵��</label>
- <div class="layui-input-block">
- <input name="color" placeholder="" class="layui-input">
- </div>
- </div>
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label">鐘舵��</label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <select id="colorBarcode" name="color" lay-filter="color" placeholder="璇烽�夋嫨鐘舵��">-->
-<!-- <option value="">璇烽�夋嫨鐘舵��</option>-->
-<!-- <option value="姝ｅ父" name="color" class="layui-input">姝ｅ父</option>-->
-<!-- <option value="鎶ュ簾" name="color" class="layui-input">鎶ュ簾</option>-->
-<!-- </select>-->
-<!-- </div>-->
-<!-- </div>-->
+ <div class="layui-form-item">
+ <label class="layui-form-label">闀垮害</label>
+ <div class="layui-input-block">
+ <input name="length" placeholder="璇疯緭鍏ラ暱搴�" class="layui-input">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">涓夋柟缂栫爜</label>
+ <div class="layui-input-block">
+ <input name="threeCode" placeholder="璇疯緭鍏ヤ笁鏂圭紪鐮�" class="layui-input">
+ </div>
+ </div>
</div>
</div>
diff --git a/src/main/webapp/views/matInOut/matInOut_old.html b/src/main/webapp/views/matInOut/matInOut_old.html
deleted file mode 100644
index d2f62ef..0000000
--- a/src/main/webapp/views/matInOut/matInOut_old.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!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="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>-->
-<!-- </div>-->
-<!-- <div class="layui-inline">-->
-<!-- <div class="layui-input-inline">-->
-<!-- <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鐮�" autocomplete="off">-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-inline">-->
-<!-- <div class="layui-input-inline">-->
-<!-- <input class="layui-input" type="text" name="model" placeholder="浜у搧浠ｇ爜" autocomplete="off">-->
-<!-- </div>-->
-<!-- </div>-->
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="specs" placeholder="瑙勬牸" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <select name="temp1" id="temp1" class="layui-input" type="text" placeholder="灞炴��" autocomplete="off">
- <!-- <option style="display: none"></option>-->
- <option value="">灞炴��</option>
- <option value="鍦ㄥ簱">鍦ㄥ簱</option>
- <option value="涓嶅湪搴�">涓嶅湪搴�</option>
- </select>
- </div>
- </div>
- <!-- <div class="layui-inline">-->
- <!-- <div class="layui-input-inline">-->
- <!-- <input class="layui-input" type="text" name="pg_no" placeholder="娲惧伐鍗曞彿" autocomplete="off">-->
- <!-- </div>-->
- <!-- </div>-->
-<!-- <div class="layui-inline">-->
-<!-- <div class="layui-input-inline">-->
-<!-- <input class="layui-input" type="text" name="out_order_no" placeholder="鍚堝悓鍙�" autocomplete="off">-->
-<!-- </div>-->
-<!-- </div>-->
- <div class="layui-inline" style="width: 300px">
- <div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="query_date" type="text" placeholder="鍏ュ簱璧峰鏃堕棿 - 鍏ュ簱缁堟鏃堕棿" autocomplete="off" style="width: 290px">
- </div>
- </div>
- <!-- <div class="layui-inline">-->
- <!-- <div class="layui-input-inline">-->
- <!-- <input class="layui-input" type="text" name="row" placeholder="鎺掓暟" autocomplete="off">-->
- <!-- </div>-->
- <!-- </div>-->
-<!-- <div class="layui-inline">-->
-<!-- <div class="layui-input-inline">-->
-<!-- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">-->
-<!-- </div>-->
-
-<!-- </div>-->
-
- <!-- 寰呮坊鍔� -->
- <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
- <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
- <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
- <!-- <button id="unreason" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="unreason">鏌ョ湅寮傚父鏁版嵁</button>-->
- </div>
-
-</div>
-
-<!-- 琛ㄦ牸 -->
-<div class="layui-form">
- <table class="layui-hide" id="locDetl" lay-filter="locDetl"></table>
-</div>
-<script type="text/html" id="toolbar">
- <div class="layui-btn-container">
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="margin-top: 10px">瀵煎嚭</button>
- </div>
-</script>
-
-<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</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>
-<script type="text/javascript" src="../../static/js/cool.js" 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>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/webapp/views/pakStore/clampDetlQuery.html b/src/main/webapp/views/pakStore/clampDetlQuery.html
index 6618a4a..8b75d15 100644
--- a/src/main/webapp/views/pakStore/clampDetlQuery.html
+++ b/src/main/webapp/views/pakStore/clampDetlQuery.html
@@ -77,39 +77,17 @@
<input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鐮�" autocomplete="off">
</div>
</div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <select name="temp1">
- <option value="">璇烽�夋嫨鎵樼洏绫诲瀷</option>
- <option value="4">1500*1500*870</option>
- <option value="5">1500*1500*1670</option>
- <option value="6">2000*1500*2170</option>
- <option value="7">2600*1500*660</option>
- <option value="8">1300*1500*1460</option>
- </select>
- </div>
- </div>
- <!--<div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="temp1" placeholder="鎬荤О" autocomplete="off">
- </div>
- </div>-->
- <!--<div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="temp2" placeholder="瀹㈡埛鍥惧彿" autocomplete="off">
- </div>
- </div>-->
- <!--<div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="outOrderNo" placeholder="鍚堝悓鍙�" autocomplete="off">
- </div>
- </div>-->
- <!-- 鏃ユ湡鑼冨洿 -->
- <!--<div class="layui-inline" style="width: 300px">
- <div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
- </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>-->
<!-- 寰呮坊鍔� -->
<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>
@@ -162,7 +140,7 @@
locDetlTableIns = table.render({
elem: '#stockOut',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/clamp/out/list/auth',
+ url: baseUrl+'/stock/out/list/auth',
page: true,
limits: [16, 30, 50, 100, 200, 500],
limit: 16,
diff --git a/src/main/webapp/views/pakStore/clampDetlQuery_old.html b/src/main/webapp/views/pakStore/clampDetlQuery_old.html
deleted file mode 100644
index ccd00c5..0000000
--- a/src/main/webapp/views/pakStore/clampDetlQuery_old.html
+++ /dev/null
@@ -1,266 +0,0 @@
-<!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>
- body {
- padding: 0 20px;
- }
- .layui-table-box {
- border-right: 1px solid #9F9F9F;
- border-left: 1px solid #9F9F9F;
- }
-
- #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;
- }
-
- </style>
-</head>
-<body>
-
-<!-- 鎼滅储鏍� -->
-<fieldset class="layui-elem-field site-demo-button" style="margin: 20px;">
- <legend>鎼滅储鏍�</legend>
- <!-- 鎼滅储鏍� -->
- <div id="search-box" class="layui-form layui-card-header">
- <!-- <div class="layui-input-inline" style="margin-top: -10px">-->
- <!-- <select id="crnNo" name="crnNo">-->
- <!-- <option value="" style="display: none">璇烽�夋嫨宸烽亾</option>-->
- <!-- <option value="1">1鍙�</option>-->
- <!-- <option value="2">2鍙�</option>-->
- <!-- <option value="3">3鍙�</option>-->
- <!-- <option value="4">4鍙�</option>-->
- <!-- </select>-->
- <!-- </div>-->
- <div class="layui-inline">
-<!-- <div class="layui-input-inline cool-auto-complete">-->
-<!-- <input id="crnNo" class="layui-input" name="crnNo" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">-->
-<!-- <input id="crnNo$" 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="basCrnpQueryBycrnNo" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
-<!-- <select class="cool-auto-complete-window-select" data-key="basCrnpQueryBycrnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
-<!-- </select>-->
-<!-- </div>-->
-<!-- </div>-->
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栫爜" autocomplete="off">
- </div>
- </div>
-<!-- <div class="layui-inline">-->
-<!-- <div class="layui-input-inline">-->
-<!-- <input class="layui-input" type="text" name="specs" placeholder="瑙勬牸" autocomplete="off">-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-inline">-->
-<!-- <div class="layui-input-inline">-->
-<!-- <input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鎻忚堪" autocomplete="off">-->
-<!-- </div>-->
-<!-- </div>-->
- <!-- 鏃ユ湡鑼冨洿 -->
-<!-- <div class="layui-inline" style="width: 300px">-->
-<!-- <div class="layui-input-inline">-->
-<!-- <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">-->
-<!-- </div>-->
-<!-- </div>-->
-
- <!-- <div class="layui-inline">-->
- <!-- <div class="layui-input-inline">-->
- <!-- <input class="layui-input" type="text" name="sPgNO" placeholder="娲惧伐鍗曞彿" autocomplete="off">-->
- <!-- </div>-->
- <!-- </div>-->
-<!-- <div class="layui-inline">-->
-<!-- <div class="layui-input-inline">-->
-<!-- <input class="layui-input" type="text" name="outOrderNo" placeholder="鍚堝悓鍙�" autocomplete="off">-->
-<!-- </div>-->
-<!-- </div>-->
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鏉＄爜" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <select name="pg_no">
- <option value="">璇烽�夋嫨鎵樼洏绫诲瀷</option>
- <option value="4">绗竴绉�</option>
- <option value="5">绗簩绉�</option>
- <option value="6">绗笁绉�</option>
- <option value="7">绗洓绉�</option>
- <option value="8">绗簲绉�</option>
- </select>
- </div>
- </div>
- <!-- 寰呮坊鍔� -->
- <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
- <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
- <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
- </div>
- </div>
-</fieldset>
-
-<script type="text/html" id="toolbar">
- <div class="layui-btn-container">
- <button class="layui-btn" id="btn-confirm" lay-event="confirm" style="">鎻愬彇</button>
- </div>
-</script>
-
-<div class="layui-form">
- <table class="layui-hide" id="stockOut" lay-filter="stockOut"></table>
-</div>
-
-<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>
-
-</body>
-<script>
-
- function getCol() {
- let cols = [
- {type: 'checkbox', merge: ['locNo']}
- ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
- ];
- cols.push.apply(cols, detlCols);
- cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'})
- 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;
-
- // 鏁版嵁娓叉煋
- locDetlTableIns = table.render({
- elem: '#stockOut',
- headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/clamp/out/list/auth',
- page: true,
- limit: 20,
- limits: [20, 50, 100, 200, 500],
- even: true,
- toolbar: '#toolbar',
- cellMinWidth: 50,
- cols: [getCol()],
- 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) {
- tableMerge.render(this);
- if (res.code === 403) {
- top.location.href = baseUrl+"/";
- }
- }
- });
-
- // 鐩戝惉澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(stockOut)', function (obj) {
- var checkStatus = table.checkStatus(obj.config.id);
- var data = checkStatus.data;
- switch(obj.event) {
- case 'confirm':
- if (data.length === 0){
- layer.msg("璇烽�夋嫨鏁版嵁", {icon: 2});
- return;
- }
- let locNos = [];
- data.forEach(function(elem) {
- locNos.push(elem.locNo);
- });
- $.ajax({
- url: baseUrl+"/locDetl/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {locNos:locNos},
- method: 'POST',
- async: false,
- success: function (res) {
- if (res.code === 200) {
- data = res.data;
- } else if (res.code === 403) {
- top.location.href = baseUrl + "/";
- } else {
- layer.msg(res.msg)
- }
- }
- })
- parent.addTableData(data);
- break;
- }
- });
-
- // 鎼滅储鏍忔悳绱簨浠�
- form.on('submit(search)', function (data) {
- tableReload();
- });
-
- layDate.render({
- elem: '.layui-laydate-range'
- ,type: 'datetime'
- ,range: true
- });
- })
-
- function tableReload() {
- var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- searchData[this.name] = this.value;
- });
- locDetlTableIns.reload({
- where: searchData
- });
- }
-
-</script>
-</html>
-
diff --git a/src/main/webapp/views/pakStore/emptyOut.html b/src/main/webapp/views/pakStore/emptyOut.html
index 6b2af22..c3c3395 100644
--- a/src/main/webapp/views/pakStore/emptyOut.html
+++ b/src/main/webapp/views/pakStore/emptyOut.html
@@ -81,6 +81,11 @@
</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>
@@ -96,13 +101,12 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <select name="loc_type1">
+ <select name="size">
<option value="">璇烽�夋嫨鎵樼洏绫诲瀷</option>
- <option value="4">1500*1500*870</option>
- <option value="5">1500*1500*1670</option>
- <option value="6">2000*1500*2170</option>
- <option value="7">2600*1500*660</option>
- <option value="8">1300*1500*1460</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>
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 63193af..8c268e2 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -64,7 +64,12 @@
</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">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="maktx" placeholder="鍟嗗搧鍚嶇О" autocomplete="off">
</div>
</div>
<div class="layui-inline">
@@ -74,7 +79,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鐮�" autocomplete="off">
+ <input class="layui-input" type="text" name="proType" placeholder="灞炴��" autocomplete="off">
</div>
</div>
<div class="layui-inline">
@@ -126,10 +131,8 @@
function getCol() {
var cols = [
- //{type: 'checkbox', merge: ['locNo']},
- {type: 'checkbox'}
- ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�', style: 'font-weight: bold'}
- //,{field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
+ {type: 'checkbox', merge: ['locNo']}
+ ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
// ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
];
cols.push.apply(cols, detlCols);
@@ -188,9 +191,6 @@
table.on('toolbar(stockOut)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
var data = checkStatus.data;
- // console.info(obj)
- // console.info(JSON.stringify(obj))
- // console.info(JSON.stringify(data))
switch(obj.event) {
case 'confirm':
if (data.length === 0){
@@ -198,15 +198,13 @@
return;
}
let locNos = [];
- let matnrs = [];
data.forEach(function(elem) {
locNos.push(elem.locNo);
- matnrs.push(elem.matnr);
});
$.ajax({
- url: baseUrl+"/locDetlOut/auth",
+ url: baseUrl+"/locDetl/auth",
headers: {'token': localStorage.getItem('token')},
- data: {locNos:locNos,matnrs:matnrs},
+ data: {locNos:locNos},
method: 'POST',
async: false,
success: function (res) {
diff --git a/src/main/webapp/views/pda/clamp.html b/src/main/webapp/views/pda/clamp.html
new file mode 100644
index 0000000..46b4c21
--- /dev/null
+++ b/src/main/webapp/views/pda/clamp.html
@@ -0,0 +1,194 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, target-densitydpi=high-dpi, initial-scale=1.0, user-scalable=no"/>
+ <title>骞舵澘</title>
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/pda.css" media="all">
+ <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>
+ <style>
+
+ </style>
+</head>
+<body>
+<!-- 澶撮儴 -->
+<header>
+ <div class="layui-input-inline">
+ <label class="layui-form-label">鎵樼洏鏉＄爜</label>
+ <input class="layui-input" type="number" id="code" onkeyup="findCode(this)" oninput="if(value.length>8)value=value.slice(0,8)" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
+ </div>
+ <div style="margin: 5px 5px">
+ <button id="mat-btn" type="button" class="layui-btn layui-btn-normal" onclick="getMat()"><i class="layui-icon">+</i>鎻愬彇</button>
+ </div>
+</header>
+
+<!-- 涓讳綋 -->
+<main>
+ <table class="layui-table" id="chooseData" lay-filter="chooseData"></table>
+</main>
+<!-- 灏鹃儴 -->
+<footer>
+ <div class="layui-btn-container">
+ <button type="button" id="reset-btn" class="layui-btn layui-btn-primary" onclick="reset()">閲嶇疆</button>
+ <button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="comb()" style="margin-left: 20px">骞舵澘</button>
+ <span id="tips"></span>
+ </div>
+</footer>
+</body>
+<script>
+ var tableIns;
+ layui.use(['table','laydate', 'form'], function() {
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var form = layui.form;
+
+ tableIns = table.render({
+ elem: '#chooseData',
+ data: [],
+ limit: 500,
+ cellMinWidth: 50,
+ cols: [[
+ {fixed: 'left', align: 'center', field: 'anfme', title: '鏁伴噺', style:'color: blue', width:50},
+ {field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿'},
+ {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'},
+ {field: 'specs', align: 'center', title: '瑙勬牸'},
+ {field: 'unit', align: 'center', title: '鍗曚綅'},
+ {field: 'barcode', align: 'center', title: '鏉＄爜'}
+ ]],
+ done: function (res, curr, anfme) {
+ }
+ });
+
+ });
+
+ window.onload = function(){document.getElementById("code").focus();}
+
+ function findCode(el) {
+ if (el.value.length === 8) {
+ $('#mat-btn').focus();
+ getMat();
+ }
+ }
+
+ var matCodeLayerIdx;
+ function getMat() {
+ matCodeLayerIdx = layer.open({
+ type: 2,
+ title: '鎻愬彇鐗╂枡',
+ shade: [0.3,'#000'],
+ area: ['90%', '80%'],
+ content: 'matQuery.html',
+ success: function(layero, index){
+ $('.layui-layer-title').css('font-size', '16px');
+ },
+ end: function () {
+ $('#mat-btn').focus();
+ }
+ });
+ }
+
+ // 娣诲姞琛ㄦ牸鏁版嵁
+ var matData = [];
+ function addTableData(data) {
+ if (isEmpty(data.maktx)){
+ tips("鎻愬彇澶辫触", true);
+ return;
+ }
+ let toPush = true;
+ for (var j=0;j<matData.length;j++){
+ if (data.matnr === matData[j].matnr) {
+ matData[j].anfme = Number(matData[j].anfme) + Number(data.anfme);
+ toPush = false;
+ }
+ }
+ if (toPush) {
+ matData.push(data);
+ }
+ tips("鎻愬彇鎴愬姛");
+ tableIns.reload({data: matData});
+ }
+
+ // 閲嶇疆
+ function reset() {
+ $('#code').val("");
+ matData = [];
+ tableIns.reload({data: matData});
+ }
+
+ // 骞舵澘
+ function comb() {
+ let barcode = $('#code').val();
+ if (isEmpty(barcode)) {
+ tips("鎵樼洏鏉＄爜涓虹┖", true);
+ // document.getElementById("code").focus();
+ return;
+ }
+ if (barcode.length !== 8) {
+ tips("鏉＄爜蹇呴』涓�8浣�", true);
+ return;
+ }
+ if (!barcode.startsWith("5") &&
+ !barcode.startsWith("6") &&
+ !barcode.startsWith("7") &&
+ !barcode.startsWith("8")){
+ tips("鎵樼洏鏉＄爜鏍煎紡閿欒", true);
+ }
+ if (matData.length === 0) {
+ tips("璇锋彁鍙栫墿鏂�", true);
+ return;
+ }
+ $.ajax({
+ url: baseUrl+"/mobile/combMeger/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify({
+ barcode: barcode,
+ combMats: matData
+ }),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200) {
+ reset();
+ tips("骞舵澘鎴愬姛")
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/pda";
+ } else {
+ tips(res.msg, true)
+ }
+ }
+ })
+ }
+
+ /**
+ * 鎻愮ず淇℃伅
+ * @param msg 鎻愮ず鍐呭
+ * @param warn true锛氱孩鑹插瓧浣�
+ */
+ function tips(msg, warn) {
+ // var tips = $('#tips');
+ // tips.html(msg);
+ // tips.css("color", warn?"red":'#666');
+ layer.msg(msg, {icon: warn?2:1})
+ }
+
+ document.onkeyup = function (e) {
+ if (window.event)//濡傛灉window.event瀵硅薄瀛樺湪锛屽氨浠ユ浜嬩欢瀵硅薄涓哄噯
+ e = window.event;
+ var key = e.charCode || e.keyCode;
+ if (key === 115) {
+ $("#comb-btn").focus();
+ comb();
+ } else if (key === 113) {
+ $("#code").val("");
+ $("#code").focus();
+ }
+ }
+</script>
+</html>
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 13b9cb1..6612aea 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -19,7 +19,7 @@
<!-- 澶撮儴 -->
<header>
<div class="layui-input-inline">
- <label class="layui-form-label">鏉＄爜</label>
+ <label class="layui-form-label">鎵樼洏鏉＄爜</label>
<input class="layui-input" type="number" id="code" onkeyup="findCode(this)" oninput="if(value.length>8)value=value.slice(0,8)" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
</div>
<div style="margin: 5px 5px">
@@ -56,7 +56,10 @@
cols: [[
{fixed: 'left', align: 'center', field: 'anfme', title: '鏁伴噺', style:'color: blue', width:50},
{field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿'},
- {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'}
+ {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'},
+ {field: 'specs', align: 'center', title: '瑙勬牸'},
+ {field: 'unit', align: 'center', title: '鍗曚綅'},
+ {field: 'barcode', align: 'center', title: '鏉＄爜'}
]],
done: function (res, curr, anfme) {
}
@@ -130,6 +133,13 @@
tips("鏉＄爜蹇呴』涓�8浣�", true);
return;
}
+ if (!barcode.startsWith("5") &&
+ !barcode.startsWith("6") &&
+ !barcode.startsWith("7") &&
+ !barcode.startsWith("8")){
+ tips("鎵樼洏鏉＄爜鏍煎紡閿欒", true);
+ return;
+ }
if (matData.length === 0) {
tips("璇锋彁鍙栫墿鏂�", true);
return;
diff --git a/src/main/webapp/views/pda/index.html b/src/main/webapp/views/pda/index.html
index cd3c9db..9d1ca2b 100644
--- a/src/main/webapp/views/pda/index.html
+++ b/src/main/webapp/views/pda/index.html
@@ -74,6 +74,8 @@
<!-- 瀵艰埅鏍� -->
<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="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>
diff --git a/src/main/webapp/views/pda/inventory.html b/src/main/webapp/views/pda/inventory.html
new file mode 100644
index 0000000..ffbfaa2
--- /dev/null
+++ b/src/main/webapp/views/pda/inventory.html
@@ -0,0 +1,411 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, target-densitydpi=high-dpi, initial-scale=1.0, user-scalable=no"/>
+ <title>鐩樼偣</title>
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/pda.css" media="all">
+ <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>
+ <style>
+ .quantity-input {
+ width: 100%;
+ height: 100%;
+ border: none;
+ text-align: center;
+ background-color: transparent;
+ color: blue;
+ }
+ </style>
+</head>
+<body>
+<!-- 澶撮儴 -->
+<header>
+ <div class="layui-input-inline">
+ <label class="layui-form-label">鎵樼洏鏉＄爜</label>
+ <input class="layui-input" type="number" id="code" onkeyup="findCode(this)" oninput="if(value.length>8)value=value.slice(0,8)" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
+ </div>
+ <div style="margin: 5px 5px">
+ <button id="mat-btn" type="button" class="layui-btn layui-btn-normal" onclick="getMat()"><i class="layui-icon">+</i>鎻愬彇</button>
+ </div>
+</header>
+
+<!-- 涓讳綋 -->
+<main>
+ <table class="layui-table" id="chooseData" lay-filter="chooseData"></table>
+</main>
+
+<!-- 灏鹃儴 -->
+<footer>
+ <div class="layui-btn-container">
+ <button type="button" id="reset-btn" class="layui-btn layui-btn-primary" onclick="reset()">閲嶇疆</button>
+ <button type="button" id="submit-btn" class="layui-btn layui-btn-normal " onclick="submitCheck()" style="margin-left: 20px">鐩樼偣</button>
+ <span id="tips"></span>
+ </div>
+</footer>
+</body>
+<script>
+ var tableIns;
+ var matData = [];
+ var currentBarcode = '';
+ var currentWrkNo = null;
+
+ layui.use(['table','laydate', 'form'], function() {
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var form = layui.form;
+
+ tableIns = table.render({
+ elem: '#chooseData',
+ data: matData,
+ limit: 500,
+ cellMinWidth: 50,
+ cols: [[
+ {fixed: 'left', align: 'center', field: 'anfme', title: '鏁伴噺', style:'color: blue', width: 50, templet: function(d){
+ return '<input type="number" class="quantity-input" value="' + (d.anfme || 0) + '" ' +
+ 'data-index="' + d.LAY_TABLE_INDEX + '" onblur="updateQuantity(this)" style="width: 100%">';
+ }},
+ {field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿'},
+ {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'},
+ {field: 'specs', align: 'center', title: '瑙勬牸'},
+ {field: 'unit', align: 'center', title: '鍗曚綅'},
+ {field: 'barcode', align: 'center', title: '鏉＄爜'},
+ {field: 'stock', align: 'center', title: '鎵樼洏鏁伴噺', style:'color: green', templet: function(d){
+ return d.stock || d.anfme || 0;
+ }}
+ ]],
+ done: function (res, curr, anfme) {
+ // 缁戝畾鏁伴噺杈撳叆妗嗕簨浠�
+ bindQuantityEvents();
+ }
+ });
+
+ function bindQuantityEvents() {
+ // 缁戝畾杈撳叆妗嗙偣鍑讳簨浠�
+ $('.quantity-input').off('click').on('click', function(e){
+ e.stopPropagation();
+ $(this).select();
+ });
+
+ // 缁戝畾鍥炶溅閿簨浠�
+ $('.quantity-input').off('keydown').on('keydown', function(e){
+ if(e.keyCode === 13) {
+ e.preventDefault();
+ updateQuantity(this);
+ $(this).blur();
+ }
+ });
+ }
+ });
+
+ window.onload = function(){
+ document.getElementById("code").focus();
+ }
+
+ function findCode(el) {
+ if (el.value.length === 8) {
+ currentBarcode = el.value;
+ getCheckDetails(currentBarcode);
+ }
+ }
+
+ var matCodeLayerIdx;
+ function getMat() {
+ matCodeLayerIdx = layer.open({
+ type: 2,
+ title: '鎻愬彇鐗╂枡',
+ shade: [0.3,'#000'],
+ area: ['90%', '80%'],
+ content: 'matQuery.html',
+ success: function(layero, index){
+ $('.layui-layer-title').css('font-size', '16px');
+ },
+ end: function () {
+ $('#mat-btn').focus();
+ }
+ });
+ }
+
+ // 娣诲姞琛ㄦ牸鏁版嵁 - 鏉ヨ嚜鐗╂枡閫夋嫨寮圭獥
+ function addTableData(data) {
+ if (isEmpty(data.maktx)){
+ tips("鎻愬彇澶辫触", true);
+ return;
+ }
+ let toPush = true;
+ for (var j=0; j<matData.length; j++){
+ if (data.matnr === matData[j].matnr) {
+ // 濡傛灉鏄悓涓�涓墿鏂欙紝绱姞鏁伴噺
+ matData[j].anfme = Number(matData[j].anfme) + Number(data.anfme);
+ toPush = false;
+ break;
+ }
+ }
+ if (toPush) {
+ // 鏂板鐗╂枡锛屾坊鍔犲簱瀛樺瓧娈�
+ var newItem = {
+ LAY_TABLE_INDEX: matData.length,
+ anfme: data.anfme || 0,
+ matnr: data.matnr || '',
+ maktx: data.maktx || '',
+ specs: data.specs || '',
+ unit: data.unit || '',
+ barcode: data.barcode || '',
+ stock: 0 // 鎵嬪姩娣诲姞鐨勭墿鏂欙紝搴撳瓨涓�0
+ };
+ matData.push(newItem);
+ }
+ tips("鎻愬彇鎴愬姛");
+ tableIns.reload({data: matData});
+ }
+
+ // 鑾峰彇鐩樼偣鏄庣粏
+ function getCheckDetails(barcode) {
+ if (!barcode || barcode.length !== 8) {
+ tips("鎵樼洏鏉＄爜蹇呴』涓�8浣�", true);
+ return;
+ }
+
+ if (!barcode.startsWith("5") &&
+ !barcode.startsWith("6") &&
+ !barcode.startsWith("7") &&
+ !barcode.startsWith("8")){
+ tips("鎵樼洏鏉＄爜鏍煎紡閿欒", true);
+ return;
+ }
+
+ tips("姝ｅ湪鏌ヨ...", false);
+
+ $.ajax({
+ url: baseUrl + "/mobile/checkDetl/auth/v2?barcode=" + encodeURIComponent(barcode),
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200) {
+ if (res.data && res.data.wrkDetls && res.data.wrkDetls.length > 0) {
+ var result = res.data;
+ currentWrkNo = result.wrkNo;
+
+ matData = result.wrkDetls.map(function(item, index) {
+ return {
+ LAY_TABLE_INDEX: index,
+ anfme: item.anfme || 0,
+ matnr: item.matnr || '',
+ maktx: item.maktx || '',
+ specs: item.specs || '',
+ unit: item.unit || '',
+ barcode: item.barcode || '',
+ stock: item.anfme || 0,
+ detlNo: item.detlNo || '',
+ wrkNo: item.wrkNo || '',
+ detlId: item.detlId || null,
+ locno: item.locno || '',
+ batch: item.batch || '',
+ itemBatch: item.itemBatch || ''
+ };
+ });
+
+ tableIns.reload({data: matData});
+ tips("鏌ヨ鎴愬姛锛屽叡 " + matData.length + " 鏉¤褰�");
+ } else {
+ matData = [];
+ tableIns.reload({data: matData});
+ tips("璇ユ墭鐩樻殏鏃犵洏鐐规暟鎹�", false);
+ }
+ } else if (res.code === 403) {
+ tips("鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�", true);
+ setTimeout(function() {
+ top.location.href = baseUrl + "/pda";
+ }, 1500);
+ } else {
+ tips(res.msg || "鏌ヨ澶辫触锛岄敊璇爜锛�" + res.code, true);
+ }
+ },
+ error: function(xhr, status, error) {
+ if (xhr.responseJSON && xhr.responseJSON.code) {
+ var res = xhr.responseJSON;
+ if (res.code === 403) {
+ tips("鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�", true);
+ setTimeout(function() {
+ top.location.href = baseUrl + "/pda";
+ }, 1500);
+ } else {
+ tips(res.msg || "鎺ュ彛杩斿洖閿欒锛岄敊璇爜锛�" + res.code, true);
+ }
+ } else {
+ if (xhr.status === 404) {
+ tips("鎺ュ彛涓嶅瓨鍦�(404)锛岃妫�鏌RL璺緞", true);
+ } else if (xhr.status === 500) {
+ tips("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�(500)", true);
+ } else if (xhr.status === 0) {
+ tips("鏃犳硶杩炴帴鍒版湇鍔″櫒锛岃妫�鏌ョ綉缁�", true);
+ } else {
+ tips("璇锋眰澶辫触锛岀姸鎬佺爜锛�" + xhr.status, true);
+ }
+ }
+ }
+ });
+ }
+
+ // 鏇存柊鏁伴噺
+ function updateQuantity(input) {
+ var value = $(input).val();
+ var index = $(input).data('index');
+
+ if (value === '' || value === null) {
+ value = 0;
+ $(input).val(0);
+ }
+
+ value = parseFloat(value);
+ if (isNaN(value) || value < 0) {
+ value = 0;
+ $(input).val(0);
+ }
+
+ if (matData[index]) {
+ matData[index].anfme = value;
+
+ // 鏇存柊杈撳叆妗嗙殑鍊�
+ $(input).val(value);
+
+ // 楂樹寒鏄剧ず宸紓
+ var stock = matData[index].stock || 0;
+ if (value !== stock) {
+ $(input).css('color', '#ff5722'); // 姗欒壊琛ㄧず鏈夊樊寮�
+ } else {
+ $(input).css('color', 'blue'); // 钃濊壊琛ㄧず鏃犲樊寮�
+ }
+ }
+ }
+
+ // 閲嶇疆
+ function reset() {
+ $('#code').val("");
+ currentBarcode = '';
+ currentWrkNo = null;
+ matData = [];
+ tableIns.reload({data: matData});
+ document.getElementById("code").focus();
+ }
+
+ // 鐩樼偣鎻愪氦 - 璋冪敤 /inventory/auth 鎺ュ彛
+ function submitCheck() {
+ let barcode = $('#code').val();
+ if (isEmpty(barcode)) {
+ tips("鎵樼洏鏉＄爜涓虹┖", true);
+ return;
+ }
+ if (barcode.length !== 8) {
+ tips("鏉＄爜蹇呴』涓�8浣�", true);
+ return;
+ }
+ if (!barcode.startsWith("5") &&
+ !barcode.startsWith("6") &&
+ !barcode.startsWith("7") &&
+ !barcode.startsWith("8")){
+ tips("鎵樼洏鏉＄爜鏍煎紡閿欒", true);
+ return;
+ }
+ if (matData.length === 0) {
+ tips("璇风洏鐐圭墿鏂�", true);
+ return;
+ }
+
+ // 鏋勫缓 CombParam 鏁版嵁缁撴瀯
+ var combMats = matData.map(function(item) {
+ var combMat = {
+ detlId: item.detlId || null,
+ detId: item.detlNo || null,
+ matnr: item.matnr || '',
+ anfme: item.anfme || 0,
+ maktx: item.maktx || '',
+ specs: item.specs || '',
+ batch: item.batch || '',
+ itemBatch: item.itemBatch || ''
+ };
+
+ // 濡傛灉鏈夊叾浠栧瓧娈典篃涓�骞舵彁浜�
+ if (item.proType) combMat.proType = item.proType;
+ if (item.temp2) combMat.temp2 = item.temp2;
+ if (item.outOrderNo) combMat.outOrderNo = item.outOrderNo;
+ if (item.memo) combMat.memo = item.memo;
+
+ return combMat;
+ });
+
+ // 鏋勫缓瀹屾暣鐨勮姹傛暟鎹�
+ var requestData = {
+ barcode: barcode,
+ locno: matData[0]?.locno || '', // 濡傛灉鏈夊簱浣嶄俊鎭�
+ combMats: combMats
+ };
+
+ // 濡傛灉鏈夊崟鎹紪鍙凤紝涔熶竴骞舵彁浜�
+ if (currentWrkNo) {
+ requestData.orderNo = currentWrkNo.toString();
+ requestData.billNo = currentWrkNo.toString();
+ }
+
+ console.log("鎻愪氦鏁版嵁:", JSON.stringify(requestData, null, 2));
+
+ tips("姝ｅ湪鎻愪氦鐩樼偣鏁版嵁...", false);
+
+ $.ajax({
+ url: baseUrl + "/mobile/inventory/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(requestData),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ reset();
+ tips("鐩樼偣鎴愬姛");
+ } else if (res.code === 403) {
+ tips("鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�", true);
+ setTimeout(function() {
+ top.location.href = baseUrl + "/pda";
+ }, 1500);
+ } else {
+ tips(res.msg || "鐩樼偣澶辫触", true);
+ }
+ },
+ error: function(xhr, status, error) {
+ if (xhr.responseJSON && xhr.responseJSON.code) {
+ tips(xhr.responseJSON.msg || "鎻愪氦澶辫触", true);
+ } else {
+ tips("鎻愪氦澶辫触锛岀姸鎬佺爜锛�" + xhr.status, true);
+ }
+ }
+ });
+ }
+
+ function tips(msg, warn) {
+ layer.msg(msg, {icon: warn?2:1})
+ }
+
+ document.onkeyup = function (e) {
+ if (window.event)
+ e = window.event;
+ var key = e.charCode || e.keyCode;
+ if (key === 115) { // F4閿�
+ $("#submit-btn").focus();
+ submitCheck();
+ } else if (key === 113) { // F2閿�
+ $("#code").val("");
+ $("#code").focus();
+ } else if (key === 114) { // F3閿�
+ getMat();
+ } else if (key === 116) { // F5閿�
+ if (currentBarcode) {
+ getCheckDetails(currentBarcode);
+ }
+ }
+ }
+</script>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index 5bfc1dc..f91f4ad 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -85,15 +85,15 @@
<input id="maktx" type="text" disabled="disabled">
</div>
<div class="form-item">
- <span>鍥惧彿</span>
- <input id="model" type="text" disabled="disabled">
+ <span>瑙勬牸</span>
+ <input id="specs" type="text" disabled="disabled">
</div>
<div class="form-item">
<span>鍗曚綅</span>
<input id="unit" type="text" disabled="disabled">
</div>
<div class="form-item">
- <span>鎵规鍙�</span>
+ <span>鏉＄爜</span>
<input id="barcode" type="text" disabled="disabled">
</div>
<div class="form-item">
@@ -129,7 +129,7 @@
if (res.code === 200) {
if (res.data != null) {
$('#maktx').val(res.data.maktx);
- $('#model').val(res.data.model);
+ $('#specs').val(res.data.specs);
$('#unit').val(res.data.unit);
$('#barcode').val(res.data.barcode);
countDom.val(initMatCount);
@@ -151,6 +151,9 @@
var data = {
matnr: $('#matnr').val(),
maktx: $('#maktx').val(),
+ specs: $('#specs').val(),
+ unit: $('#unit').val(),
+ barcode: $('#barcode').val(),
anfme: countDom.val()
};
parent.addTableData(data);
diff --git a/src/main/webapp/views/stoMan/stoQue.html b/src/main/webapp/views/stoMan/stoQue.html
index ffc3e82..8c7d80e 100644
--- a/src/main/webapp/views/stoMan/stoQue.html
+++ b/src/main/webapp/views/stoMan/stoQue.html
@@ -43,16 +43,16 @@
</div>
</div>
</div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <select name="loc_type1" id="loc_type1" class="layui-input" type="text" placeholder="搴撲綅绫诲瀷" autocomplete="off">
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <select name="loc_type1" id="loc_type1" class="layui-input" type="text" placeholder="搴撲綅绫诲瀷" autocomplete="off">-->
<!-- <option style="display: none"></option>-->
- <option value=""></option>
- <option value="1">灏忓簱浣�</option>
- <option value="2">澶у簱浣�</option>
- </select>
- </div>
- </div>
+<!-- <option value=""></option>-->
+<!-- <option value="1">灏忓簱浣�</option>-->
+<!-- <option value="2">澶у簱浣�</option>-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="crn_no" placeholder="鍫嗗灈鏈哄彿" autocomplete="off">
diff --git a/src/main/webapp/views/waitPakin/waitPakin.html b/src/main/webapp/views/waitPakin/waitPakin.html
index cfd8cae..331f54d 100644
--- a/src/main/webapp/views/waitPakin/waitPakin.html
+++ b/src/main/webapp/views/waitPakin/waitPakin.html
@@ -46,8 +46,6 @@
<!-- <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
deleted file mode 100644
index 36d5a95..0000000
--- a/src/main/webapp/views/waitPakin/waitPakin_clamp.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!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
deleted file mode 100644
index c57f104..0000000
--- a/src/main/webapp/views/waitPakin/waitPakin_comb.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!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>
-
--
Gitblit v1.9.1