From 979f2505861b77b8702604739486b62f1e339e76 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 07 十月 2025 08:44:11 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/system/controller/UserController.java | 16 +
src/main/webapp/static/js/barcodeMatnr/barcodeMatnr.js | 68 ++++--
src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java | 48 ++++
src/main/java/com/zy/asrs/service/MatBarcodeService.java | 3
src/main/webapp/views/barcodeMatnr/barcodeMatnr.html | 3
src/main/webapp/views/barcodeMatnr/barcodeMatnr_comb.html | 132 +++++++++++++
src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java | 29 ++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 66 ++++++
src/main/webapp/views/barcodeMatnr/barcodeMatnr_detail.html | 38 +-
src/main/java/com/zy/common/model/LocTypeDto.java | 10
src/main/webapp/views/barcodeMatnr/barcodeMatnr_clamp.html | 132 +++++++++++++
src/main/java/com/zy/asrs/service/MobileService.java | 2
12 files changed, 492 insertions(+), 55 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java b/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
index bdb26e2..c9855a2 100644
--- a/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
+++ b/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
@@ -3,11 +3,16 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.MatBarcode;
+import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.param.CombParam;
+import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.service.MatBarcodeService;
+import com.zy.asrs.service.MobileService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -23,6 +28,8 @@
public class BarcodeMatnrController extends BaseController {
@Autowired
private MatBarcodeService matBarcodeService;
+ @Autowired
+ private MobileService mobileService;
/*
* 鐗╂枡鎵樼洏缁戝畾鍒嗛〉鏌ヨ
* */
@@ -65,4 +72,45 @@
matBarcodeService.deleteMatBarcode(list);
return R.ok();
}
+
+ /*鐗╂枡鎵樼洏缁戝畾
+ *
+ * */
+ @RequestMapping(value = "/barcodeMatnr/add/auth")
+ @ManagerAuth
+ public R add(WaitPakin waitPakin) {
+ if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())){
+ return R.error(BaseRes.PARAM);
+ }
+ matBarcodeService.addBarcodeMatnr(waitPakin);
+ return R.ok();
+ }
+
+ /*缁勬墭
+ *
+ * */
+ @RequestMapping(value = "/barcodeMatnr/add1/auth")
+ @ManagerAuth
+ public R comb(WaitPakin waitPakin) {
+ if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())||Cools.isEmpty(waitPakin.getAnfme())){
+ return R.error(BaseRes.PARAM);
+ }
+ mobileService.combToWms(waitPakin);
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
+ /*骞舵澘
+ *
+ * */
+ @RequestMapping(value = "/barcodeMatnr/add2/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);
+ }
+ MobileAdjustParam combParam=new MobileAdjustParam();
+ combParam.setBarcode(waitPakin.getBarcode());
+ mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
+ return R.ok("骞舵澘鎴愬姛");
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/MatBarcodeService.java b/src/main/java/com/zy/asrs/service/MatBarcodeService.java
index 2fd37e7..6f4ae3f 100644
--- a/src/main/java/com/zy/asrs/service/MatBarcodeService.java
+++ b/src/main/java/com/zy/asrs/service/MatBarcodeService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.MatBarcode;
+import com.zy.asrs.entity.WaitPakin;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -11,4 +12,6 @@
MatBarcode selectbyMatnr(String matnr);
void deleteMatBarcode(List<MatBarcode> list);
+
+ void addBarcodeMatnr(WaitPakin waitPakin);
}
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 8871512..0fde44f 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -4,6 +4,7 @@
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.OffSaleParam;
@@ -42,4 +43,5 @@
void adjustNew(MobileAdjustParam param, Boolean re, Long userId);
+ void combToWms(WaitPakin waitPakin);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java
index 52f2dd5..8de630f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java
@@ -1,9 +1,13 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MatBarcode;
+import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.mapper.MatBarcodeMapper;
import com.zy.asrs.service.MatBarcodeService;
+import com.zy.asrs.service.MatService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -14,6 +18,10 @@
public class MatBarcodeServiceImpl extends ServiceImpl<MatBarcodeMapper, MatBarcode> implements MatBarcodeService {
@Autowired
private MatBarcodeMapper matBarcodeMapper;
+ @Autowired
+ private MatBarcodeService matBarcodeService;
+ @Autowired
+ private MatService matService;
@Override
public MatBarcode selectbyMatnr(String matnr) {
return this.baseMapper.selectByMatnr(matnr);
@@ -25,4 +33,25 @@
matBarcodeMapper.deleteByMatnr(matBarcode.getMatnr());
}
}
+
+ @Override
+ public void addBarcodeMatnr(WaitPakin waitPakin) {
+ Mat mat = matService.selectById(waitPakin.getModiUser());
+ if (mat == null){
+ throw new CoolException("鐗╂枡涓嶅瓨鍦紝璇峰厛娣诲姞鐗╂枡鏁版嵁");
+ }
+ MatBarcode matBarcode = matBarcodeMapper.selectByMatnr(mat.getMatnr());
+ if (matBarcode != null){
+ throw new CoolException("璇ョ墿鏂欏凡缁忕粦瀹氭墭鐩橈紝璇峰嬁閲嶅缁戝畾");
+ }
+ MatBarcode mb=new MatBarcode();
+ mb.setZpallet(waitPakin.getBarcode());
+ mb.setMatnr(mat.getMatnr());
+ mb.setMaktx(mat.getMaktx());
+ mb.setSpecs(mat.getSpecs());
+ mb.setModel(mat.getModel());
+ if (!matBarcodeService.insert(mb)){
+ throw new CoolException("鐗╂枡鎵樼洏缁戝畾澶辫触");
+ }
+ }
}
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 f26f4b8..af100de 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -730,4 +730,70 @@
}
log.info(recordRecordLog);
}
+
+ @Override
+ public void combToWms(WaitPakin waitPakin) {
+ // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+// if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+// eq("zpallet", waitPakin.getBarcode()).eq("io_status", "N")) > 0) {
+// throw new CoolException(waitPakin.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+// }
+
+ if (waitPakin.getBarcode().length() != 8) {
+ throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + waitPakin.getBarcode());
+ }
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", waitPakin.getBarcode()));
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", waitPakin.getBarcode()));
+ int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", waitPakin.getBarcode()));
+ if (countLoc > 0 || countWrk > 0) {
+ throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + waitPakin.getBarcode());
+ }
+
+ 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);
+ }
+
+
+ for (DetlDto dto : detlDtos) {
+ Mat mat = matService.selectByMatnr(dto.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(dto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ }
+ //鏍￠獙褰撳墠鐗╂枡涓庢墭鐩樼粦瀹氫俊鎭槸鍚︽纭�
+ MatBarcode mb = matBarcodeService.selectbyMatnr(dto.getMatnr());
+ if (mb != null){
+ if (!mb.getZpallet().equals(waitPakin.getBarcode())){
+ throw new CoolException(detlDto.getMatnr() + "璇ョ墿鏂欎笌鍏朵粬鎵樼洏缁戝畾锛岃鍏堣В缁�");
+ }
+ }
+ WaitPakin waitPakin1 = new WaitPakin();
+ waitPakin1.sync(mat);
+ 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("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ }
+ }
}
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index d68e24f..8fc9892 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -13,7 +13,7 @@
@Data
public class LocTypeDto {
- // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣�,3:涓簱浣峿
+ // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,5:楂樺簱浣�,2:涓簱浣�,6:瓒呴珮搴撲綅}
private Short locType1;
// 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
@@ -32,9 +32,11 @@
if (basDevp.getLocType1() == 1) {
this.locType1 = 1; // 浣庡簱浣�
} else if (basDevp.getLocType1() ==2){
- this.locType1 = 2; // 楂樺簱浣�
- } else {
- this.locType1 = 3; // 涓簱浣�
+ this.locType1 = 2; // 涓簱浣�
+ } else if (basDevp.getLocType1() == 5){
+ this.locType1 = 5; // 楂樺簱浣�
+ }else if (basDevp.getLocType1() == 6){
+ this.locType1 = 6;//瓒呴珮搴撲綅
}
log.info(JSON.toJSONString(this));
}
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index a823f5a..3a76d06 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -3,6 +3,8 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
+import com.zy.asrs.entity.Mat;
+import com.zy.asrs.service.MatService;
import com.zy.common.web.BaseController;
import com.zy.system.entity.Role;
import com.zy.system.entity.User;
@@ -24,6 +26,8 @@
private UserService userService;
@Autowired
private RoleService roleService;
+ @Autowired
+ private MatService matService;
@RequestMapping(value = "/user/{id}/auth")
@ManagerAuth
@@ -144,14 +148,14 @@
@RequestMapping(value = "/userQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<User> wrapper = new EntityWrapper<>();
- wrapper.like("username", condition);
- Page<User> page = userService.selectPage(new Page<>(0, 10), wrapper);
+ EntityWrapper<Mat> wrapper = new EntityWrapper<>();
+ wrapper.like("matnr", condition);
+ Page<Mat> page = matService.selectPage(new Page<>(0, 100000), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (User user : page.getRecords()){
+ for (Mat mat : page.getRecords()){
Map<String, Object> map = new HashMap<>();
- map.put("id", user.getId());
- map.put("value", user.getUsername());
+ map.put("id", mat.getId());
+ map.put("value", mat.getMaktx());
result.add(map);
}
return R.ok(result);
diff --git a/src/main/webapp/static/js/barcodeMatnr/barcodeMatnr.js b/src/main/webapp/static/js/barcodeMatnr/barcodeMatnr.js
index 10a4ea0..e5beb3f 100644
--- a/src/main/webapp/static/js/barcodeMatnr/barcodeMatnr.js
+++ b/src/main/webapp/static/js/barcodeMatnr/barcodeMatnr.js
@@ -145,30 +145,32 @@
});
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+"/waitPakin/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)
- }
- }
- })
- });
- }
+ layer.open({
+ type: 2,
+ title: '缁勬墭',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ content: 'barcodeMatnr_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: 'barcodeMatnr_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(){
@@ -338,6 +340,22 @@
method("add");
});
+ form.on('submit(save1)', function () {
+ if (banMsg != null){
+ layer.msg(banMsg);
+ return;
+ }
+ method("add1");
+ });
+
+ form.on('submit(save2)', function () {
+ if (banMsg != null){
+ layer.msg(banMsg);
+ return;
+ }
+ method("add2");
+ });
+
// 鏁版嵁淇敼鍔ㄤ綔
form.on('submit(edit)', function () {
method("update")
@@ -364,7 +382,7 @@
};
$.ajax({
- url: baseUrl+"/waitPakin/"+name+"/auth",
+ url: baseUrl+"/barcodeMatnr/"+name+"/auth",
headers: {'token': localStorage.getItem('token')},
data: top.reObject(data),
method: 'POST',
diff --git a/src/main/webapp/views/barcodeMatnr/barcodeMatnr.html b/src/main/webapp/views/barcodeMatnr/barcodeMatnr.html
index 8a20ffc..37cae47 100644
--- a/src/main/webapp/views/barcodeMatnr/barcodeMatnr.html
+++ b/src/main/webapp/views/barcodeMatnr/barcodeMatnr.html
@@ -45,7 +45,8 @@
<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-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>
diff --git a/src/main/webapp/views/barcodeMatnr/barcodeMatnr_clamp.html b/src/main/webapp/views/barcodeMatnr/barcodeMatnr_clamp.html
new file mode 100644
index 0000000..5c4bb45
--- /dev/null
+++ b/src/main/webapp/views/barcodeMatnr/barcodeMatnr_clamp.html
@@ -0,0 +1,132 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 璇︽儏 -->
+<div id="data-detail" class="layer_self_wrap">
+ <form id="detail" class="layui-form">
+ <!--
+ <div class="layui-inline" style="display: none">
+ <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="id" class="layui-input" type="text" placeholder="缂栧彿">
+ </div>
+ </div>
+ -->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="id" class="layui-input" type="text" onkeyup="check(this.id, 'waitPakin')" lay-verify="number" >-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鎵� 鐩� 鐮侊細</label>
+ <div class="layui-input-inline">
+ <input id="barcode" class="layui-input" type="text">
+ </div>
+ </div>
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鍟嗗搧缂栧彿锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="matnr" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鐗╂枡鎻忚堪锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="maktx" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鏁般��銆�閲忥細</label>
+ <div class="layui-input-inline">
+ <input id="anfme" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鍗曘��銆�浣嶏細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="unit" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鐘躲��銆�鎬侊細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="status" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">澶囥��銆�娉細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="memo" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">淇敼鏃堕棿锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="modiTime$" class="layui-input" type="text" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鐗╂枡缂栫爜锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="modiUser" class="layui-input" type="text" lay-verify="number" style="display: none">
+ <input id="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">娣诲姞鏃堕棿锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="appeTime$" class="layui-input" type="text" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鍒� 寤� 鑰咃細</label>-->
+<!-- <div class="layui-input-inline cool-auto-complete">-->
+<!-- <input id="appeUser" class="layui-input" type="text" lay-verify="number" style="display: none">-->
+<!-- <input id="appeUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+
+
+ <hr class="layui-bg-gray">
+
+ <div id="data-detail-btn" class="layui-btn-container layui-form-item">
+ <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="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
new file mode 100644
index 0000000..a7ba0bc
--- /dev/null
+++ b/src/main/webapp/views/barcodeMatnr/barcodeMatnr_comb.html
@@ -0,0 +1,132 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 璇︽儏 -->
+<div id="data-detail" class="layer_self_wrap">
+ <form id="detail" class="layui-form">
+ <!--
+ <div class="layui-inline" style="display: none">
+ <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="id" class="layui-input" type="text" placeholder="缂栧彿">
+ </div>
+ </div>
+ -->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="id" class="layui-input" type="text" onkeyup="check(this.id, 'waitPakin')" lay-verify="number" >-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鎵� 鐩� 鐮侊細</label>
+ <div class="layui-input-inline">
+ <input id="barcode" class="layui-input" type="text">
+ </div>
+ </div>
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鍟嗗搧缂栧彿锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="matnr" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鐗╂枡鎻忚堪锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="maktx" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鏁般��銆�閲忥細</label>
+ <div class="layui-input-inline">
+ <input id="anfme" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鍗曘��銆�浣嶏細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="unit" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鐘躲��銆�鎬侊細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="status" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">澶囥��銆�娉細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="memo" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">淇敼鏃堕棿锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="modiTime$" class="layui-input" type="text" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鐗╂枡缂栫爜锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="modiUser" class="layui-input" type="text" lay-verify="number" style="display: none">
+ <input id="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">娣诲姞鏃堕棿锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="appeTime$" class="layui-input" type="text" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鍒� 寤� 鑰咃細</label>-->
+<!-- <div class="layui-input-inline cool-auto-complete">-->
+<!-- <input id="appeUser" class="layui-input" type="text" lay-verify="number" style="display: none">-->
+<!-- <input id="appeUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+
+
+ <hr class="layui-bg-gray">
+
+ <div id="data-detail-btn" class="layui-btn-container layui-form-item">
+ <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="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
index 8258e5c..9ababd6 100644
--- a/src/main/webapp/views/barcodeMatnr/barcodeMatnr_detail.html
+++ b/src/main/webapp/views/barcodeMatnr/barcodeMatnr_detail.html
@@ -29,12 +29,12 @@
<!-- <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="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">-->
@@ -95,25 +95,25 @@
<!-- <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>
+<!-- <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-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>
--
Gitblit v1.9.1