From c22266b4dfbe3f338d2dd0bb31b10df1b5c92fb5 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 24 五月 2025 13:54:39 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/OrderPakinController.java | 102 ++++----
src/main/java/com/zy/asrs/controller/LocMastController.java | 2
src/main/java/com/zy/nc/service/NccSaleDbddWmsService.java | 2
src/main/java/com/zy/nc/mapper/NccSaleDbddWmsMapper.java | 2
src/main/resources/mapper/asrs/StoreTypeMapper.xml | 9
src/main/webapp/views/orderPakout/order.html | 12 +
src/main/webapp/views/order/order.html | 14 +
src/main/java/com/zy/nc/service/impl/NccScZkmxbWmsServiceImpl.java | 4
src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java | 4
src/main/java/com/zy/nc/service/NccScZkmxbWmsService.java | 4
src/main/java/com/zy/nc/task/PlanOrderTask.java | 11
src/main/java/com/zy/asrs/entity/StoreType.java | 84 +++++++
src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java | 4
src/main/java/com/zy/asrs/controller/InventoryCheckOrderDetlController.java | 2
src/main/java/com/zy/nc/mapper/NccScZkmxbWmsMapper.java | 4
src/main/java/com/zy/asrs/controller/MatController.java | 2
src/main/webapp/static/js/orderPakin/order.js | 2
src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java | 4
src/main/webapp/views/orderPakin/order.html | 12 +
src/main/java/com/zy/asrs/controller/OrderController.java | 10
src/main/java/com/zy/asrs/controller/LocDetlController.java | 2
src/main/java/com/zy/nc/task/BaseDataTask.java | 11 +
src/main/java/com/zy/nc/service/impl/NccSaleDbddWmsServiceImpl.java | 2
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 2
src/main/java/com/zy/asrs/controller/OrderPakoutController.java | 100 ++++----
src/main/java/com/zy/asrs/mapper/StoreTypeMapper.java | 16 +
src/main/java/com/zy/asrs/service/StoreTypeService.java | 11 +
src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java | 2
src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java | 24 +-
src/main/webapp/static/js/orderPakout/order.js | 2
src/main/java/com/zy/asrs/controller/StoreTypeController.java | 133 ++++++++++++
src/main/java/com/zy/asrs/controller/LocCheckController.java | 2
src/main/java/com/zy/asrs/service/impl/StoreTypeServiceImpl.java | 27 ++
src/main/webapp/static/js/order/order.js | 2
src/main/java/com/zy/nc/task/handler/BaseDataHandler.java | 22 +
src/main/java/com/zy/asrs/controller/TagController.java | 2
36 files changed, 514 insertions(+), 136 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
index 879e668..9c7d50f 100644
--- a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
+++ b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
@@ -185,7 +185,7 @@
public R query(String condition) {
EntityWrapper<InventoryCheckOrder> wrapper = new EntityWrapper<>();
wrapper.like("id", condition);
- Page<InventoryCheckOrder> page = inventoryCheckOrderService.selectPage(new Page<>(0, 10), wrapper);
+ Page<InventoryCheckOrder> page = inventoryCheckOrderService.selectPage(new Page<>(0, 1000), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (InventoryCheckOrder inventoryCheckOrder : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderDetlController.java b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderDetlController.java
index 7e1e31b..c2eb04f 100644
--- a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderDetlController.java
@@ -127,7 +127,7 @@
public R query(String condition) {
EntityWrapper<InventoryCheckOrderDetl> wrapper = new EntityWrapper<>();
wrapper.like("id", condition);
- Page<InventoryCheckOrderDetl> page = inventoryCheckOrderDetlService.selectPage(new Page<>(0, 10), wrapper);
+ Page<InventoryCheckOrderDetl> page = inventoryCheckOrderDetlService.selectPage(new Page<>(0, 10000), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (InventoryCheckOrderDetl inventoryCheckOrderDetl : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/asrs/controller/LocCheckController.java b/src/main/java/com/zy/asrs/controller/LocCheckController.java
index 8549423..7310146 100644
--- a/src/main/java/com/zy/asrs/controller/LocCheckController.java
+++ b/src/main/java/com/zy/asrs/controller/LocCheckController.java
@@ -99,7 +99,7 @@
public R query(String condition) {
EntityWrapper<LocCheck> wrapper = new EntityWrapper<>();
wrapper.like("id", condition);
- Page<LocCheck> page = locCheckService.selectPage(new Page<>(0, 10), wrapper);
+ Page<LocCheck> page = locCheckService.selectPage(new Page<>(0, 10000), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (LocCheck locCheck : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 619459d..e626706 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -385,7 +385,7 @@
public R query(String condition) {
EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
wrapper.like("matnr", condition);
- Page<LocDetl> page = locDetlService.selectPage(new Page<>(0, 10), wrapper);
+ Page<LocDetl> page = locDetlService.selectPage(new Page<>(0, 10000), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (LocDetl locDetl : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index c914c92..3925dd5 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -255,7 +255,7 @@
public R query(String condition) {
EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
wrapper.like("loc_no", condition);
- Page<LocMast> page = locMastService.selectPage(new Page<>(0, 10), wrapper);
+ Page<LocMast> page = locMastService.selectPage(new Page<>(0, 10000), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (LocMast locMast : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 53e9135..eb07ba8 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -199,7 +199,7 @@
public R query(String condition) {
EntityWrapper<Mat> wrapper = new EntityWrapper<>();
wrapper.like("matnr", condition).or().like("maktx", condition);
- Page<Mat> page = matService.selectPage(new Page<>(0, 10), wrapper);
+ Page<Mat> page = matService.selectPage(new Page<>(0, 10000), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Mat mat : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 8a9ffd2..996dcb0 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -125,8 +125,8 @@
param.getOrderNo(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
param.getDocType(), // 鍗曟嵁绫诲瀷
- null, // 椤圭洰缂栧彿
- null, //
+ param.getItemId(), // 椤圭洰缂栧彿
+ param.getItemName(), //
null, // 璋冩嫧椤圭洰缂栧彿
null, // 鍒濆绁ㄦ嵁鍙�
null, // 绁ㄦ嵁鍙�
@@ -202,10 +202,12 @@
Date now = new Date();
Long userId = getUserId();
// 淇敼涓绘。
- if (!param.getDocType().equals(order.getDocType())) {
+ if (!param.getDocType().equals(order.getDocType()) || param.getItemId() != order.getItemId()) {
order.setDocType(param.getDocType());
order.setUpdateBy(userId);
order.setUpdateTime(now);
+ order.setItemId(param.getItemId());
+ order.setItemName(param.getItemName());
if (!orderService.updateById(order)) {
throw new CoolException("淇敼璁㈠崟绫诲瀷澶辫触");
}
@@ -416,7 +418,7 @@
public R query(String condition) {
EntityWrapper<Order> wrapper = new EntityWrapper<>();
wrapper.like("id", condition);
- Page<Order> page = orderService.selectPage(new Page<>(0, 10), wrapper);
+ Page<Order> page = orderService.selectPage(new Page<>(0, 10000), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Order order : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 9b2e3d5..1da5ec6 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -113,7 +113,7 @@
public R query(String condition) {
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
wrapper.like("id", condition);
- Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(0, 10), wrapper);
+ Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(0, 10000), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (OrderDetl orderDetl : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakinController.java b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
index fb81d0f..6069d60 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
@@ -45,7 +45,7 @@
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
- public R navList(@RequestParam(required = false) String orderNo){
+ public R navList(@RequestParam(required = false) String orderNo) {
EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(orderNo)) {
wrapper.like("order_no", orderNo);
@@ -73,15 +73,17 @@
@RequestMapping(value = "/order/head/page/auth")
@ManagerAuth
- public R head(@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){
+ public R head(@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) {
EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("settle").orderBy("create_time", false);
}
wrapper.eq("status", 1);
@@ -90,18 +92,18 @@
@RequestMapping(value = "/order/detl/all/auth")
@ManagerAuth
- public R head(@RequestParam Long orderId){
+ public R head(@RequestParam Long orderId) {
return R.ok().add(orderDetlService.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_id", orderId)));
}
@RequestMapping(value = "/order/form/add/auth")
@ManagerAuth(memo = "鎵嬪姩娣诲姞璁㈠崟")
@Transactional
- public R formAdd(@RequestBody OrderDomainParam param){
- if(Cools.isEmpty(param.getOrderNo())){
+ public R formAdd(@RequestBody OrderDomainParam param) {
+ if (Cools.isEmpty(param.getOrderNo())) {
String prefix = "";
DocType docType = docTypeService.selectById(param.getDocType());
- if(!Cools.isEmpty(docType)){
+ if (!Cools.isEmpty(docType)) {
prefix = docType.getPakin() == 1 ? "RK" : "CK";
}
param.setOrderNo(prefix + snowflakeIdWorker.nextId());
@@ -116,8 +118,8 @@
param.getOrderNo(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
param.getDocType(), // 鍗曟嵁绫诲瀷
- null, // 椤圭洰缂栧彿
- null, //
+ param.getItemId(), // 椤圭洰缂栧彿
+ param.getItemName(), //
null, // 璋冩嫧椤圭洰缂栧彿
null, // 鍒濆绁ㄦ嵁鍙�
null, // 绁ㄦ嵁鍙�
@@ -152,14 +154,14 @@
}
List<DetlDto> list = new ArrayList<>();
for (OrderDetlPakin orderDetl : param.getOrderDetlPakinList()) {
- DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
+ DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
if (DetlDto.has(list, dto)) {
- OrderDetlPakin item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ OrderDetlPakin item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -185,7 +187,7 @@
@RequestMapping(value = "/order/form/modify/auth")
@ManagerAuth(memo = "鎵嬪姩淇敼璁㈠崟")
@Transactional
- public R formModify(@RequestBody OrderDomainParam param){
+ public R formModify(@RequestBody OrderDomainParam param) {
OrderPakin order = orderService.selectById(param.getOrderId());
if (order == null || order.getStatus() == 0) {
return R.error("璁㈠崟涓嶅瓨鍦�");
@@ -193,10 +195,12 @@
Date now = new Date();
Long userId = getUserId();
// 淇敼涓绘。
- if (!param.getDocType().equals(order.getDocType())) {
+ if (!param.getDocType().equals(order.getDocType()) || param.getItemId() != order.getItemId()) {
order.setDocType(param.getDocType());
order.setUpdateBy(userId);
order.setUpdateTime(now);
+ order.setItemId(param.getItemId());
+ order.setItemName(param.getItemName());
if (!orderService.updateById(order)) {
throw new CoolException("淇敼璁㈠崟绫诲瀷澶辫触");
}
@@ -212,12 +216,12 @@
for (OrderDetlPakin orderDetl : param.getOrderDetlPakinList()) {
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(),
orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
if (DetlDto.has(list, dto)) {
- OrderDetlPakin item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand()
- ,orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ OrderDetlPakin item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand()
+ , orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -279,8 +283,8 @@
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
if (wrkMast == null) {
WrkMastLog wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
- if (wrkMastLog.getIoType()==103){
- wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()).eq("io_type",53));
+ if (wrkMastLog.getIoType() == 103) {
+ wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()).eq("io_type", 53));
}
if (wrkMastLog != null) {
wrkMast = new WrkMast();
@@ -308,9 +312,9 @@
.add("list", wrkTraceVos)
.add("orderNo", order.getOrderNo())
.add("totalQty", totalQty)
- .add("wrkQty", wrkQty+endQty)
+ .add("wrkQty", wrkQty + endQty)
.add("lackQty", lackQty)
- .add("endQty",endQty)
+ .add("endQty", endQty)
);
}
@@ -325,22 +329,24 @@
@RequestMapping(value = "/order/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@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) {
EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -352,15 +358,15 @@
@RequestMapping(value = "/order/update/auth")
@ManagerAuth
- public R update(OrderPakin order){
- if (Cools.isEmpty(order) || null == order.getId()){
+ public R update(OrderPakin order) {
+ if (Cools.isEmpty(order) || null == order.getId()) {
return R.error();
}
//璁㈠崟瀹岀粨鍓嶏紝鍒ゆ柇鏄惁瀛樺湪浣滀笟涓暟鎹紝瀛樺湪鍒欎笉鑳藉畬缁�
- if(order.getSettle() == 4){
- int wrkCount = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no",order.getOrderNo()));
- int pakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no",order.getOrderNo()));
+ if (order.getSettle() == 4) {
+ int wrkCount = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", order.getOrderNo()));
+ int pakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no", order.getOrderNo()));
if (wrkCount > 0 || pakinCount > 0) {
throw new CoolException("瀛樺湪浣滀笟涓暟鎹紝涓嶈兘瀹岀粨銆傝妫�鏌ュ叆搴撻�氱煡妗ｅ拰宸ヤ綔妗�");
}
@@ -377,7 +383,7 @@
@RequestMapping(value = "/order/delete/auth")
@ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
@Transactional
- public R delete(@RequestParam Long orderId){
+ public R delete(@RequestParam Long orderId) {
orderService.remove(orderId);
// Order order = orderService.selectById(orderId);
// if (order != null) {
@@ -392,7 +398,7 @@
@RequestMapping(value = "/order/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("order"));
@@ -408,7 +414,7 @@
wrapper.like("id", condition);
Page<OrderPakin> page = orderService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (OrderPakin order : page.getRecords()){
+ for (OrderPakin order : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", order.getId());
map.put("value", order.getOrderNo());
@@ -421,7 +427,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<OrderPakin> wrapper = new EntityWrapper<OrderPakin>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != orderService.selectOne(wrapper)){
+ if (null != orderService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(OrderPakin.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
index 23fbfff..f0d8fed 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
@@ -45,7 +45,7 @@
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
- public R navList(@RequestParam(required = false) String orderNo){
+ public R navList(@RequestParam(required = false) String orderNo) {
EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(orderNo)) {
wrapper.like("order_no", orderNo);
@@ -73,15 +73,17 @@
@RequestMapping(value = "/order/head/page/auth")
@ManagerAuth
- public R head(@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){
+ public R head(@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) {
EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("settle").orderBy("create_time", false);
}
wrapper.eq("status", 1);
@@ -90,18 +92,18 @@
@RequestMapping(value = "/order/detl/all/auth")
@ManagerAuth
- public R head(@RequestParam Long orderId){
+ public R head(@RequestParam Long orderId) {
return R.ok().add(orderDetlService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_id", orderId)));
}
@RequestMapping(value = "/order/form/add/auth")
@ManagerAuth(memo = "鎵嬪姩娣诲姞璁㈠崟")
@Transactional
- public R formAdd(@RequestBody OrderDomainParam param){
- if(Cools.isEmpty(param.getOrderNo())){
+ public R formAdd(@RequestBody OrderDomainParam param) {
+ if (Cools.isEmpty(param.getOrderNo())) {
String prefix = "";
DocType docType = docTypeService.selectById(param.getDocType());
- if(!Cools.isEmpty(docType)){
+ if (!Cools.isEmpty(docType)) {
prefix = docType.getPakin() == 1 ? "RK" : "CK";
}
param.setOrderNo(prefix + snowflakeIdWorker.nextId());
@@ -116,8 +118,8 @@
param.getOrderNo(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
param.getDocType(), // 鍗曟嵁绫诲瀷
- null, // 椤圭洰缂栧彿
- null, //
+ param.getItemId(), // 椤圭洰缂栧彿
+ param.getItemName(), //
null, // 璋冩嫧椤圭洰缂栧彿
null, // 鍒濆绁ㄦ嵁鍙�
null, // 绁ㄦ嵁鍙�
@@ -152,12 +154,12 @@
}
List<DetlDto> list = new ArrayList<>();
for (OrderDetlPakout orderDetl : param.getOrderDetlPakoutList()) {
- DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
if (DetlDto.has(list, dto)) {
- OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -183,7 +185,7 @@
@RequestMapping(value = "/order/form/modify/auth")
@ManagerAuth(memo = "鎵嬪姩淇敼璁㈠崟")
@Transactional
- public R formModify(@RequestBody OrderDomainParam param){
+ public R formModify(@RequestBody OrderDomainParam param) {
OrderPakout order = orderService.selectById(param.getOrderId());
if (order == null || order.getStatus() == 0) {
return R.error("璁㈠崟涓嶅瓨鍦�");
@@ -191,10 +193,12 @@
Date now = new Date();
Long userId = getUserId();
// 淇敼涓绘。
- if (!param.getDocType().equals(order.getDocType())) {
+ if (!param.getDocType().equals(order.getDocType()) || param.getItemId() != order.getItemId()) {
order.setDocType(param.getDocType());
order.setUpdateBy(userId);
order.setUpdateTime(now);
+ order.setItemId(param.getItemId());
+ order.setItemName(param.getItemName());
if (!orderService.updateById(order)) {
throw new CoolException("淇敼璁㈠崟绫诲瀷澶辫触");
}
@@ -208,13 +212,13 @@
// 2.閲嶇粍鏁版嵁
List<DetlDto> list = new ArrayList<>();
for (OrderDetlPakout orderDetl : param.getOrderDetlPakoutList()) {
- DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
if (DetlDto.has(list, dto)) {
OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),
- orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -276,8 +280,8 @@
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
if (wrkMast == null) {
WrkMastLog wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
- if (wrkMastLog.getIoType()==103){
- wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()).eq("io_type",53));
+ if (wrkMastLog.getIoType() == 103) {
+ wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()).eq("io_type", 53));
}
if (wrkMastLog != null) {
wrkMast = new WrkMast();
@@ -305,9 +309,9 @@
.add("list", wrkTraceVos)
.add("orderNo", order.getOrderNo())
.add("totalQty", totalQty)
- .add("wrkQty", wrkQty+endQty)
+ .add("wrkQty", wrkQty + endQty)
.add("lackQty", lackQty)
- .add("endQty",endQty)
+ .add("endQty", endQty)
);
}
@@ -322,22 +326,24 @@
@RequestMapping(value = "/order/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@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) {
EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -349,15 +355,15 @@
@RequestMapping(value = "/order/update/auth")
@ManagerAuth
- public R update(OrderPakout order){
- if (Cools.isEmpty(order) || null == order.getId()){
+ public R update(OrderPakout order) {
+ if (Cools.isEmpty(order) || null == order.getId()) {
return R.error();
}
//璁㈠崟瀹岀粨鍓嶏紝鍒ゆ柇鏄惁瀛樺湪浣滀笟涓暟鎹紝瀛樺湪鍒欎笉鑳藉畬缁�
- if(order.getSettle() == 4){
- int wrkCount = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no",order.getOrderNo()));
- int pakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no",order.getOrderNo()));
+ if (order.getSettle() == 4) {
+ int wrkCount = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", order.getOrderNo()));
+ int pakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no", order.getOrderNo()));
if (wrkCount > 0 || pakinCount > 0) {
throw new CoolException("瀛樺湪浣滀笟涓暟鎹紝涓嶈兘瀹岀粨銆傝妫�鏌ュ叆搴撻�氱煡妗ｅ拰宸ヤ綔妗�");
}
@@ -374,7 +380,7 @@
@RequestMapping(value = "/order/delete/auth")
@ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
@Transactional
- public R delete(@RequestParam Long orderId){
+ public R delete(@RequestParam Long orderId) {
orderService.remove(orderId);
// Order order = orderService.selectById(orderId);
// if (order != null) {
@@ -389,7 +395,7 @@
@RequestMapping(value = "/order/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("order"));
@@ -405,7 +411,7 @@
wrapper.like("id", condition);
Page<OrderPakout> page = orderService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (OrderPakout order : page.getRecords()){
+ for (OrderPakout order : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", order.getId());
map.put("value", order.getOrderNo());
@@ -418,7 +424,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<OrderPakout> wrapper = new EntityWrapper<OrderPakout>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != orderService.selectOne(wrapper)){
+ if (null != orderService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(OrderPakout.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/StoreTypeController.java b/src/main/java/com/zy/asrs/controller/StoreTypeController.java
new file mode 100644
index 0000000..2df1ce6
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/StoreTypeController.java
@@ -0,0 +1,133 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+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.DocType;
+import com.zy.asrs.entity.StoreType;
+import com.zy.asrs.service.StoreTypeService;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class StoreTypeController extends BaseController {
+
+ @Autowired
+ private StoreTypeService storeTypeService;
+
+ @RequestMapping(value = "/storeType/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(storeTypeService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/storeType/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
+ EntityWrapper<StoreType> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
+ return R.ok(storeTypeService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/storeType/add/auth")
+ @ManagerAuth
+ public R add(StoreType docType) {
+ docType.setStatus(1);
+ docType.setCreateBy(getUserId());
+ docType.setCreateTime(new Date());
+ docType.setUpdateBy(getUserId());
+ docType.setUpdateTime(new Date());
+ storeTypeService.insert(docType);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/storeType/update/auth")
+ @ManagerAuth
+ public R update(StoreType docType) {
+ if (Cools.isEmpty(docType) || null == docType.getStoreId()) {
+ return R.error();
+ }
+ docType.setUpdateBy(getUserId());
+ docType.setUpdateTime(new Date());
+ storeTypeService.updateById(docType);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/storeType/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
+ storeTypeService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/storeType/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param) {
+ EntityWrapper<StoreType> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("docType"));
+ convert(map, wrapper);
+ List<StoreType> list = storeTypeService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/storeTypeQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<StoreType> wrapper = new EntityWrapper<>();
+ wrapper.like("store_name", condition);
+ wrapper.eq("status", 1);
+ Page<StoreType> page = storeTypeService.selectPage(new Page<>(0, 10000), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (StoreType docType : page.getRecords()) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", docType.getStoreId());
+ map.put("value", docType.getStoreName());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/storeType/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<StoreType> wrapper = new EntityWrapper<StoreType>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != storeTypeService.selectOne(wrapper)) {
+ return R.parse(BaseRes.REPEAT).add(getComment(DocType.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/TagController.java b/src/main/java/com/zy/asrs/controller/TagController.java
index c5e92f0..73158ad 100644
--- a/src/main/java/com/zy/asrs/controller/TagController.java
+++ b/src/main/java/com/zy/asrs/controller/TagController.java
@@ -156,7 +156,7 @@
public R query(String condition) {
EntityWrapper<Tag> wrapper = new EntityWrapper<>();
wrapper.like("uuid", condition).or().like("name", condition);
- Page<Tag> page = tagService.selectPage(new Page<>(0, 10), wrapper);
+ Page<Tag> page = tagService.selectPage(new Page<>(0, 10000), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Tag tag : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/asrs/entity/StoreType.java b/src/main/java/com/zy/asrs/entity/StoreType.java
new file mode 100644
index 0000000..09446d8
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/StoreType.java
@@ -0,0 +1,84 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("man_store")
+public class StoreType implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 浠撳簱id
+ */
+ @ApiModelProperty(value = "浠撳簱id")
+ @TableId(value = "store_id", type = IdType.INPUT)
+ @TableField("store_id")
+ private String storeId;
+
+ /**
+ * 绫诲瀷鍚嶇О
+ */
+ @ApiModelProperty(value = "绫诲瀷鍚嶇О")
+ @TableField("store_name")
+ private String storeName;
+
+ /**
+ * 鏄惁绔嬪簱鏈韩
+ */
+ @ApiModelProperty(value = "鏄惁绔嬪簱鏈韩锛�0涓嶆槸锛�1鏄�")
+ private Integer own = 0;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status = 0;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
+ @TableField("create_by")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value = "淇敼浜哄憳")
+ @TableField("update_by")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String memo;
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
index 965a9d1..96257ee 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
@@ -17,6 +17,10 @@
private String orderTime;
+ private Long itemId;
+
+ private String itemName;
+
private List<DetlDto> orderDetails;
}
diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
index b78ee02..8630ccd 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
@@ -21,6 +21,10 @@
private String orderTime;
+ private Long itemId;
+
+ private String itemName;
+
private List<DetlDto> orderDetails;
private String lgort;
diff --git a/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java b/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java
index 352cfe3..1458f63 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java
@@ -19,6 +19,10 @@
private String orderNo;
+ private Long itemId;
+
+ private String itemName;
+
private List<OrderDetl> orderDetlList;
private List<OrderDetlPakin> orderDetlPakinList;
private List<OrderDetlPakout> orderDetlPakoutList;
diff --git a/src/main/java/com/zy/asrs/mapper/StoreTypeMapper.java b/src/main/java/com/zy/asrs/mapper/StoreTypeMapper.java
new file mode 100644
index 0000000..7150317
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/StoreTypeMapper.java
@@ -0,0 +1,16 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.DocType;
+import com.zy.asrs.entity.StoreType;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Mapper
+@Repository
+public interface StoreTypeMapper extends BaseMapper<StoreType> {
+
+ List<String> listOwn();
+}
diff --git a/src/main/java/com/zy/asrs/service/StoreTypeService.java b/src/main/java/com/zy/asrs/service/StoreTypeService.java
new file mode 100644
index 0000000..0cba87c
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/StoreTypeService.java
@@ -0,0 +1,11 @@
+package com.zy.asrs.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.StoreType;
+
+import java.util.List;
+
+public interface StoreTypeService extends IService<StoreType> {
+
+ List<String> listOwn();
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
index d492cfa..72b5c6d 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -100,7 +100,7 @@
}
break;
case "杞簱-鍑哄簱":
- process1 = processZKCK(orderDetls);
+ process1 = processZKCK(order, orderDetls);
List<Object> zkck1 = new ArrayList<>();
zkck1.add(process1);
//鍙戦�佽姹�
@@ -242,27 +242,25 @@
return data;
}
- private Object processZKCK(List<OrderDetl> orderDetls) {
+ private Object processZKCK(Order order, List<OrderDetl> orderDetls) {
//缁勮瀵硅薄鏁版嵁
Map<String, Object> data = new HashMap<String, Object>();
WhsTransBillHeaderVO whsTransBillHeaderVO = new WhsTransBillHeaderVO();
whsTransBillHeaderVO.setPk_org("FYT");
- whsTransBillHeaderVO.setCwarehouseid("6101");
+ whsTransBillHeaderVO.setCwarehouseid(order.getItemId() + "");
+ whsTransBillHeaderVO.setCotherbizid(order.getAllotItemId() + "");
+ whsTransBillHeaderVO.setCtrantypeid("4K-Cxx-01");
WhsTransBillBodyVO whsTransBillBodyVO = null;
List<WhsTransBillBodyVO> whsTransBillBodyVOS = new ArrayList<>();
for (OrderDetl orderDetl : orderDetls) {
whsTransBillBodyVO = new WhsTransBillBodyVO();
String remark = orderDetl.getRemark();
- if (!Cools.isEmpty(remark)) {
- NccSaleXsfhmxWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleXsfhmxWms.class);
- whsTransBillBodyVO.setCsourcetype("4331");
- whsTransBillBodyVO.setClocationid("610101");
- whsTransBillBodyVO.setCsourcebillbid(nccSaleXsfhmxWms.getCdeliverybid());
- whsTransBillBodyVO.setCsourcebillhid(nccSaleXsfhmxWms.getCdeliveryid());
- whsTransBillBodyVO.setNnum(orderDetl.getQty());
- whsTransBillBodyVO.setVbatchcode(orderDetl.getBatch());
- whsTransBillBodyVO.setCmaterialoid(orderDetl.getMatnr());
- }
+ //if (!Cools.isEmpty(remark)) {
+ //NccSaleXsfhmxWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleXsfhmxWms.class);
+ whsTransBillBodyVO.setNnum(orderDetl.getQty());
+ whsTransBillBodyVO.setVfree10(orderDetl.getBatch());
+ whsTransBillBodyVO.setCmaterialoid(orderDetl.getMatnr());
+ //}
whsTransBillBodyVOS.add(whsTransBillBodyVO);
}
data.put("WhsTransBillHeaderVO", whsTransBillHeaderVO);
diff --git a/src/main/java/com/zy/asrs/service/impl/StoreTypeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/StoreTypeServiceImpl.java
new file mode 100644
index 0000000..1d75818
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/StoreTypeServiceImpl.java
@@ -0,0 +1,27 @@
+package com.zy.asrs.service.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.DocType;
+import com.zy.asrs.entity.StoreType;
+import com.zy.asrs.mapper.DocTypeMapper;
+import com.zy.asrs.mapper.StoreTypeMapper;
+import com.zy.asrs.service.DocTypeService;
+import com.zy.asrs.service.StoreTypeService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+@Service("storeTypeService")
+public class StoreTypeServiceImpl extends ServiceImpl<StoreTypeMapper, StoreType> implements StoreTypeService {
+
+
+ @Override
+ public List<String> listOwn() {
+ return this.baseMapper.listOwn();
+ }
+}
diff --git a/src/main/java/com/zy/nc/mapper/NccSaleDbddWmsMapper.java b/src/main/java/com/zy/nc/mapper/NccSaleDbddWmsMapper.java
index ba6f913..01115da 100644
--- a/src/main/java/com/zy/nc/mapper/NccSaleDbddWmsMapper.java
+++ b/src/main/java/com/zy/nc/mapper/NccSaleDbddWmsMapper.java
@@ -14,7 +14,7 @@
*/
public interface NccSaleDbddWmsMapper extends BaseMapper<NccSaleDbddWms> {
- List<String> selectDbdd(@Param("ids") List<Integer> ids);
+ List<String> selectDbdd(@Param("ids") List<String> ids);
}
diff --git a/src/main/java/com/zy/nc/mapper/NccScZkmxbWmsMapper.java b/src/main/java/com/zy/nc/mapper/NccScZkmxbWmsMapper.java
index fc8f93e..bcb530b 100644
--- a/src/main/java/com/zy/nc/mapper/NccScZkmxbWmsMapper.java
+++ b/src/main/java/com/zy/nc/mapper/NccScZkmxbWmsMapper.java
@@ -15,7 +15,7 @@
public interface NccScZkmxbWmsMapper extends BaseMapper<NccScZkmxbWms> {
- List<String> selectZkOut(@Param("ids") List<Integer> ids);
+ List<String> selectZkOut(@Param("ids") List<String> ids);
- List<String> selectZkIn(@Param("ids")List<Integer> ids);
+ List<String> selectZkIn(@Param("ids")List<String> ids);
}
diff --git a/src/main/java/com/zy/nc/service/NccSaleDbddWmsService.java b/src/main/java/com/zy/nc/service/NccSaleDbddWmsService.java
index 909b082..b793a59 100644
--- a/src/main/java/com/zy/nc/service/NccSaleDbddWmsService.java
+++ b/src/main/java/com/zy/nc/service/NccSaleDbddWmsService.java
@@ -12,5 +12,5 @@
*/
public interface NccSaleDbddWmsService extends IService<NccSaleDbddWms> {
- List<String> selectDbdd(List<Integer> ids);
+ List<String> selectDbdd(List<String> ids);
}
diff --git a/src/main/java/com/zy/nc/service/NccScZkmxbWmsService.java b/src/main/java/com/zy/nc/service/NccScZkmxbWmsService.java
index abe437b..f1fc1a8 100644
--- a/src/main/java/com/zy/nc/service/NccScZkmxbWmsService.java
+++ b/src/main/java/com/zy/nc/service/NccScZkmxbWmsService.java
@@ -12,7 +12,7 @@
*/
public interface NccScZkmxbWmsService extends IService<NccScZkmxbWms> {
- List<String> selectZkOut(List<Integer> ids);
+ List<String> selectZkOut(List<String> ids);
- List<String> selectZkIn(List<Integer> ids);
+ List<String> selectZkIn(List<String> ids);
}
diff --git a/src/main/java/com/zy/nc/service/impl/NccSaleDbddWmsServiceImpl.java b/src/main/java/com/zy/nc/service/impl/NccSaleDbddWmsServiceImpl.java
index e907eda..98e3d28 100644
--- a/src/main/java/com/zy/nc/service/impl/NccSaleDbddWmsServiceImpl.java
+++ b/src/main/java/com/zy/nc/service/impl/NccSaleDbddWmsServiceImpl.java
@@ -18,7 +18,7 @@
implements NccSaleDbddWmsService {
@Override
- public List<String> selectDbdd(List<Integer> ids) {
+ public List<String> selectDbdd(List<String> ids) {
return this.baseMapper.selectDbdd(ids);
}
}
diff --git a/src/main/java/com/zy/nc/service/impl/NccScZkmxbWmsServiceImpl.java b/src/main/java/com/zy/nc/service/impl/NccScZkmxbWmsServiceImpl.java
index 4aa7f3f..da204da 100644
--- a/src/main/java/com/zy/nc/service/impl/NccScZkmxbWmsServiceImpl.java
+++ b/src/main/java/com/zy/nc/service/impl/NccScZkmxbWmsServiceImpl.java
@@ -20,12 +20,12 @@
@Override
- public List<String> selectZkOut(List<Integer> ids) {
+ public List<String> selectZkOut(List<String> ids) {
return this.baseMapper.selectZkOut(ids);
}
@Override
- public List<String> selectZkIn(List<Integer> ids) {
+ public List<String> selectZkIn(List<String> ids) {
return this.baseMapper.selectZkIn(ids);
}
}
diff --git a/src/main/java/com/zy/nc/task/BaseDataTask.java b/src/main/java/com/zy/nc/task/BaseDataTask.java
index 1115db1..82de69d 100644
--- a/src/main/java/com/zy/nc/task/BaseDataTask.java
+++ b/src/main/java/com/zy/nc/task/BaseDataTask.java
@@ -57,4 +57,15 @@
}
}
+
+ /**
+ * 浠撳簱鍩虹鏁版嵁鍚屾
+ */
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public void execute6() {
+ ReturnT<String> returnT = baseDataHandler.start6();
+ if (!returnT.isSuccess()) {
+ log.error(returnT.getMsg());
+ }
+ }
}
diff --git a/src/main/java/com/zy/nc/task/PlanOrderTask.java b/src/main/java/com/zy/nc/task/PlanOrderTask.java
index 54ed163..5ebd329 100644
--- a/src/main/java/com/zy/nc/task/PlanOrderTask.java
+++ b/src/main/java/com/zy/nc/task/PlanOrderTask.java
@@ -1,6 +1,7 @@
package com.zy.nc.task;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.service.StoreTypeService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.nc.entity.*;
import com.zy.nc.service.*;
@@ -36,8 +37,9 @@
@Autowired
private NccCkPddWmsService nccCkPddWmsService;
+
@Autowired
- private ConfigServiceImpl configService;
+ private StoreTypeService storeTypeService;
/**
* 鍙戣揣
@@ -71,8 +73,7 @@
*/
@Scheduled(cron = "0/3 * * * * ? ")
public void execute2_1() {
- //Config wmsFlag1 = configService.selectConfigByCode("wms_flag");
- List<Integer> ids = Arrays.asList(6101, 6102, 6106, 6110);
+ List<String> ids = storeTypeService.listOwn();
//String s = "涓�鏈熸垚鍝佸簱-鍐呰锤(绔嬩綋搴�)銆佷竴鏈熸垚鍝佸簱-绂忚幈鍥介檯澶栬锤(绔嬩綋搴�)銆佷竴鏈熸垚鍝佸簱-澶栬喘(绔嬩綋搴�)銆佷竴鏈熸垚鍝佸簱-绂忚揪/宸ュ巶澶栬锤(绔嬩綋搴�)銆佷竴鏈熻緟鏂欏簱-鍖呮潗(绔嬩綋搴�)";
List<String> strings = nccScZkmxbWmsService.selectZkIn(ids);
for (String string : strings) {
@@ -98,7 +99,7 @@
*/
@Scheduled(cron = "0/3 * * * * ? ")
public void execute2_2() {
- List<Integer> ids = Arrays.asList(6101, 6102, 6106, 6110);
+ List<String> ids = storeTypeService.listOwn();
List<String> strings = nccScZkmxbWmsService.selectZkOut(ids);
for (String string : strings) {
List<NccScZkmxbWms> wmsFlag = nccScZkmxbWmsService.selectList(new EntityWrapper<NccScZkmxbWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("hdr", 0).eq("bdr", 0));
@@ -148,7 +149,7 @@
*/
@Scheduled(cron = "0/3 * * * * ? ")
public void execute5() {
- List<Integer> ids = Arrays.asList(6101, 6102, 6106, 6110);
+ List<String> ids = storeTypeService.listOwn();
List<String> strings = nccSaleDbddWmsService.selectDbdd(ids);
for (String string : strings) {
List<NccSaleDbddWms> wmsFlag = nccSaleDbddWmsService.selectList(new EntityWrapper<NccSaleDbddWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("dr", 0).eq("bdr", 0));
diff --git a/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java b/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
index 3406dbc..0499cd0 100644
--- a/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
@@ -4,9 +4,11 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.Cools;
+import com.zy.asrs.entity.StoreType;
import com.zy.asrs.entity.Tag;
import com.zy.asrs.entity.param.MatSyncParam;
import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.StoreTypeService;
import com.zy.asrs.service.TagService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -72,6 +74,9 @@
@Autowired
private UserService userService;
+ @Autowired
+ private StoreTypeService storeTypeService;
+
@Value("${NYNC.pageSize}")
private Integer pageSize;
@@ -133,6 +138,21 @@
Page<NccJcCkWms> wmsFlag = nccJcCkWmsService.selectPage(page, new EntityWrapper<NccJcCkWms>().ne("wms_flag", 1));
for (NccJcCkWms nccJcCkWms : wmsFlag.getRecords()) {
log.info("NccJcCkWms鏁版嵁:{}", JSONObject.toJSON(nccJcCkWms));
+ StoreType storeType = storeTypeService.selectById(nccJcCkWms.getCode());
+ if (storeType == null) {
+ storeType = new StoreType();
+ storeType.setStoreName(nccJcCkWms.getName());
+ storeType.setStatus(1);
+ storeType.setStoreId(nccJcCkWms.getCode());
+ storeType.setCreateBy(1L);
+ storeType.setCreateTime(new Date());
+ storeTypeService.insert(storeType);
+ } else {
+ storeType.setStoreName(nccJcCkWms.getName());
+ storeTypeService.updateById(storeType);
+ }
+ nccJcCkWms.setWmsFlag(1);
+ nccJcCkWmsService.updateById(nccJcCkWms);
}
return SUCCESS;
}
@@ -159,7 +179,7 @@
user.setStatus(1);
user.setCreateTime(new Date());
userService.insert(user);
- }else {
+ } else {
user.setUsername(nccJcRyWms.getRybm());
user.setNickname(nccJcRyWms.getRymc());
user.setRoleId(12L);
diff --git a/src/main/resources/mapper/asrs/StoreTypeMapper.xml b/src/main/resources/mapper/asrs/StoreTypeMapper.xml
new file mode 100644
index 0000000..c948f1f
--- /dev/null
+++ b/src/main/resources/mapper/asrs/StoreTypeMapper.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.StoreTypeMapper">
+
+ <select id="listOwn" resultType="string">
+ select store_id from man_store where own =1
+ </select>
+
+</mapper>
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 6345ea7..e9d8a02 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -204,6 +204,8 @@
orderId: Number(data.field.id),
docType: Number(data.field.docType),
orderNo: data.field.orderNo,
+ itemId: Number(data.field.itemId),
+ itemName: data.field.itemName,
orderDetlList: nList
}),
contentType:'application/json;charset=UTF-8',
diff --git a/src/main/webapp/static/js/orderPakin/order.js b/src/main/webapp/static/js/orderPakin/order.js
index 6b38ea5..7b6bfb8 100644
--- a/src/main/webapp/static/js/orderPakin/order.js
+++ b/src/main/webapp/static/js/orderPakin/order.js
@@ -204,6 +204,8 @@
orderId: Number(data.field.id),
docType: Number(data.field.docType),
orderNo: data.field.orderNo,
+ itemId: Number(data.field.itemId),
+ itemName: data.field.itemName,
orderDetlPakinList: nList
}),
contentType:'application/json;charset=UTF-8',
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index bedb1f0..d6fb9aa 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -204,6 +204,8 @@
orderId: Number(data.field.id),
docType: Number(data.field.docType),
orderNo: data.field.orderNo,
+ itemId: Number(data.field.itemId),
+ itemName: data.field.itemName,
orderDetlPakoutList: nList
}),
contentType:'application/json;charset=UTF-8',
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 3e88192..dd8a05d 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -157,6 +157,18 @@
</div>
</div>
<div class="layui-form-item">
+ <label class="layui-form-label">鍏ュ簱浠撳簱锛�</label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="itemId" placeholder="璇疯緭鍏ュ叆搴撲粨搴�" style="display: none">
+ <input id="itemName" name="itemName" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ崟鎹被鍨�" onfocus=this.blur() lay-verType="tips" lay-verify="required">
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="storeTypeQueryBystoreType" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="storeTypeQueryBystoreTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
<label class="layui-form-label">鍗曟嵁缂栧彿锛�</label>
<div class="layui-input-block">
<input id="orderNo" name="orderNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" />
@@ -307,7 +319,7 @@
<script type="text/javascript" src="../../static/js/echarts/echarts.min.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/order/order.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/order/order.js?v=3" charset="utf-8"></script>
<script type="text/template" id="docTypeTpl">
<option value="">閫夋嫨绫诲瀷</option>
diff --git a/src/main/webapp/views/orderPakin/order.html b/src/main/webapp/views/orderPakin/order.html
index 5b15330..b45c3e1 100644
--- a/src/main/webapp/views/orderPakin/order.html
+++ b/src/main/webapp/views/orderPakin/order.html
@@ -157,6 +157,18 @@
</div>
</div>
<div class="layui-form-item">
+ <label class="layui-form-label">鍏ュ簱浠撳簱锛�</label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="itemId" placeholder="璇疯緭鍏ュ叆搴撲粨搴�" style="display: none">
+ <input id="itemName" name="itemName" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ崟鎹被鍨�" onfocus=this.blur() lay-verType="tips" lay-verify="required">
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="storeTypeQueryBystoreType" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="storeTypeQueryBystoreTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
<label class="layui-form-label">鍗曟嵁缂栧彿锛�</label>
<div class="layui-input-block">
<input id="orderNo" name="orderNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" />
diff --git a/src/main/webapp/views/orderPakout/order.html b/src/main/webapp/views/orderPakout/order.html
index 7584f2e..ef24a81 100644
--- a/src/main/webapp/views/orderPakout/order.html
+++ b/src/main/webapp/views/orderPakout/order.html
@@ -157,6 +157,18 @@
</div>
</div>
<div class="layui-form-item">
+ <label class="layui-form-label">鍏ュ簱浠撳簱锛�</label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="itemId" placeholder="璇疯緭鍏ュ叆搴撲粨搴�" style="display: none">
+ <input id="itemName" name="itemName" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ崟鎹被鍨�" onfocus=this.blur() lay-verType="tips" lay-verify="required">
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="storeTypeQueryBystoreType" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="storeTypeQueryBystoreTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
<label class="layui-form-label">鍗曟嵁缂栧彿锛�</label>
<div class="layui-input-block">
<input id="orderNo" name="orderNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" />
--
Gitblit v1.9.1