From 32a905fbf1daeac74cbd573e5b841709c44955c2 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期四, 08 五月 2025 17:01:27 +0800
Subject: [PATCH] 代码编写
---
src/main/java/com/zy/nc/service/impl/NccSaleXsfhmxWmsServiceImpl.java | 18
src/main/resources/mapper/nc/NccCgCgdhdWmsMapper.xml | 3
src/main/java/com/zy/nc/vo/SaleOutHeadVO.java | 8
src/main/resources/mapper/nc/NccCkPddWmsMapper.xml | 3
src/main/resources/mapper/nc/VGetBdMaterialMapper.xml | 3
src/main/resources/mapper/nc/NccOrgCorpWmsMapper.xml | 3
src/main/java/com/zy/asrs/service/ReportToThirdService.java | 2
src/main/java/com/zy/nc/entity/NccScZkmxbWms.java | 200 +++----
src/main/java/com/zy/nc/service/NccSaleXsfhmxWmsService.java | 4
src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml | 9
src/main/resources/mapper/nc/NccJcCkhwMapper.xml | 4
src/main/resources/mapper/nc/NccJcWlflWmsMapper.xml | 3
src/main/java/com/zy/nc/service/impl/NccScZkmxbWmsServiceImpl.java | 9
src/main/java/com/zy/nc/service/NccScZkmxbWmsService.java | 5
src/main/java/com/zy/nc/task/PlanOrderTask.java | 19
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 321 ++++++------
src/main/java/com/zy/common/model/DetlDto.java | 22
src/main/java/com/zy/nc/mapper/NccScZkmxbWmsMapper.java | 16
src/main/resources/mapper/nc/NccJcQilibcBarcodeflowWmsMapper.xml | 3
src/main/resources/mapper/nc/NccSaleXsfhmxWmsMapper.xml | 11
src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java | 2
src/main/resources/mapper/nc/NccJcBmWmsMapper.xml | 3
license.lic | 0
src/main/java/com/zy/common/config/ds/DataSourceType.java | 4
src/main/java/com/zy/nc/SendUtil.java | 144 +++--
src/main/java/com/zy/nc/task/BaseDataTask.java | 37 +
src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java | 77 ++
src/main/java/com/zy/asrs/service/impl/TagServiceImpl.java | 2
src/main/java/com/zy/nc/mapper/NccSaleXsfhmxWmsMapper.java | 16
/dev/null | 64 --
src/main/java/com/zy/common/config/ds/DataSourceAop.java | 6
src/main/resources/mapper/nc/NccJcCkWmsMapper.xml | 3
src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java | 116 ++--
src/main/java/com/zy/nc/util/NcResultMessage.java | 2
src/main/resources/mapper/nc/NccBdCustomerWmsMapper.xml | 3
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 15
src/main/java/com/zy/nc/task/handler/BaseDataHandler.java | 242 +++++++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 58 +-
src/main/resources/license.lic | 0
src/main/resources/mapper/nc/NccJcRyWmsMapper.xml | 4
src/main/resources/application.yml | 15
41 files changed, 895 insertions(+), 584 deletions(-)
diff --git a/license.lic b/license.lic
index 22364dc..9b8be17 100644
--- a/license.lic
+++ b/license.lic
Binary files differ
diff --git a/src/main/java/com/zy/asrs/service/ReportToThirdService.java b/src/main/java/com/zy/asrs/service/ReportToThirdService.java
index 5be3e90..c495d54 100644
--- a/src/main/java/com/zy/asrs/service/ReportToThirdService.java
+++ b/src/main/java/com/zy/asrs/service/ReportToThirdService.java
@@ -8,5 +8,5 @@
public interface ReportToThirdService {
- void report(Order order, List<OrderDetl> orderDetls, DocType docType);
+ void report(Order order, List<OrderDetl> orderDetls, DocType docType) throws Exception;
}
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 c401b70..2e85903 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -13,7 +13,6 @@
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
import com.zy.asrs.utils.OrderInAndOutUtil;
-import com.zy.common.constant.MesConstant;
import com.zy.common.entity.Parameter;
import com.zy.common.model.DetlDto;
import com.zy.common.model.MesCombParam;
@@ -805,167 +804,167 @@
@Override
@Transactional
public void packComb(CombParam param, Long userId) {
- if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
- throw new CoolException(BaseRes.PARAM);
- }
- // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
- if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
- throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
- }
- Date now = new Date();
-
- boolean packDown = Parameter.get().getPackDown().equals("true");
-
- // 鏃犲崟缁勬墭
- if (Cools.isEmpty(param.getOrderNo())) {
-
- // 鐢熸垚鍏ュ簱閫氱煡妗�
- List<DetlDto> detlDtos = new ArrayList<>();
- param.getCombMats().forEach(elem -> {
- // 鎵撳寘涓婄嚎鏁版嵁鏍￠獙
- if (packDown) {
- Pack pack = packService.selectByBarcode(elem.getMatnr());
- if (pack == null) {
- throw new CoolException(elem.getMatnr() + "鏉＄爜鍐椾綑锛岃妫�鏌ワ紒");
- }
- if (pack.getSettle() != 1) {
- throw new CoolException(elem.getMatnr() + "鏉＄爜宸蹭笅绾匡紝璇锋鏌ワ紒");
- }
- }
- Mat analyse = MatUtils.analyseMat(elem.getMatnr());
- // 鏉＄爜銆佺墿鏂欎唬鐮併�佸簭鍒楀彿銆佹暟閲�
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(),analyse.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(),
- elem.getBoxType1(),elem.getBoxType2(),elem.getBoxType3(), elem.getAnfme());
-
-// DetlDto detlDto = new DetlDto(elem.getMatnr(), analyse.getMatnr(), analyse.getBarcode(), elem.getAnfme());
-// DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
- if (DetlDto.has(detlDtos, detlDto)) {
- DetlDto one = DetlDto.findDto(detlDtos, detlDto);
- assert one != null;
- one.setAnfme(one.getAnfme() + detlDto.getAnfme());
- } else {
- detlDtos.add(detlDto);
- }
- });
-
- if (packDown) {
- MesCombParam mesCombParam = new MesCombParam();
- mesCombParam.setZpallet(param.getBarcode());
- mesCombParam.setPakinTime(DateUtils.convert(now));
- mesCombParam.setLgort("5008");
- mesCombParam.setPlantCode("5000");
- mesCombParam.setFromCode("5012-20");
- mesCombParam.setStationCode("JJQ-PFZPDB-XX");
- for (DetlDto detlDto : detlDtos) {
- mesCombParam.getList().add(new MesCombParam.Detl(detlDto.getOrderNo(), detlDto.getAnfme()));
- }
- String response = "";
- boolean success = false;
- try {
- response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
- .setPath(MesConstant.PACK_DOWN_URL)
- .setJson(JSON.toJSONString(mesCombParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- success = true;
- } else if (jsonObject.getInteger("code").equals(500)) {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
- throw new CoolException(jsonObject.getString("msg"));
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
- }
- } catch (Exception e) {
- log.error("fail", e);
- throw new CoolException(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鎵撳寘涓嬬嚎甯墭涓婃姤",
- MesConstant.URL + MesConstant.PACK_DOWN_URL,
- null,
- "127.0.0.1",
- JSON.toJSONString(mesCombParam),
- response,
- success
- );
- } catch (Exception e) { log.error("", e); }
- }
-
- }
-
- // 鐢熸垚鍏ュ簱鍗曟嵁
- String orderNo = "PACK" + snowflakeIdWorker.nextId();
- OpenOrderPakinParam openParam = new OpenOrderPakinParam();
- openParam.setOrderNo(orderNo);
- openParam.setOrderTime(DateUtils.convert(now));
- openParam.setOrderType("鎵撳寘鍏ュ簱鍗�");
- openParam.setOrderDetails(detlDtos);
- openService.pakinOrderCreate(openParam);
-// Order order = orderService.selectByNo(orderNo);
- Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, param.getOrderNo());
-
- if (null == order) {
- throw new CoolException("鐢熸垚鍗曟嵁澶辫触");
- }
-// if (!orderService.updateSettle(order.getId(), 2L, userId)) {
-// throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
-// }
- OrderInAndOutUtil.updateOrder(Boolean.TRUE, order.getId(), 2L, userId);
-
- // 鐢熸垚鍏ュ簱閫氱煡妗�
- for (DetlDto detlDto : detlDtos) {
-
- // 淇敼浣滀笟鏁伴噺 ----------------------------------------
- // 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
-// OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), detlDto.getMatnr(), detlDto.getBatch());
- OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3()
- ,detlDto.getBoxType1(),detlDto.getBoxType2(),detlDto.getBoxType3());
- if (detlDto.getAnfme() > orderDetl.getEnableQty()) {
- throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
- }
- // 淇敼璁㈠崟浣滀笟鏁伴噺
-// if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
-// throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
+// if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
+// throw new CoolException(BaseRes.PARAM);
+// }
+// // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+// if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+// eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+// throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+// }
+// Date now = new Date();
+//
+// boolean packDown = Parameter.get().getPackDown().equals("true");
+//
+// // 鏃犲崟缁勬墭
+// if (Cools.isEmpty(param.getOrderNo())) {
+//
+// // 鐢熸垚鍏ュ簱閫氱煡妗�
+// List<DetlDto> detlDtos = new ArrayList<>();
+// param.getCombMats().forEach(elem -> {
+// // 鎵撳寘涓婄嚎鏁版嵁鏍￠獙
+// if (packDown) {
+// Pack pack = packService.selectByBarcode(elem.getMatnr());
+// if (pack == null) {
+// throw new CoolException(elem.getMatnr() + "鏉＄爜鍐椾綑锛岃妫�鏌ワ紒");
+// }
+// if (pack.getSettle() != 1) {
+// throw new CoolException(elem.getMatnr() + "鏉＄爜宸蹭笅绾匡紝璇锋鏌ワ紒");
+// }
// }
- OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE,order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3()
- ,detlDto.getBoxType1(),detlDto.getBoxType2(),detlDto.getBoxType3(), detlDto.getAnfme());
- // 淇濆瓨鍏ュ簱閫氱煡妗�
- Mat mat = matService.selectByMatnr(detlDto.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
- WaitPakin waitPakin = new WaitPakin();
- waitPakin.sync(mat);
- waitPakin.setOrderNo(orderNo);
- waitPakin.setBatch(detlDto.getBatch());
- waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
- waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
- waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
- waitPakin.setStatus("Y"); // 鐘舵��
- waitPakin.setAppeUser(userId);
- waitPakin.setAppeTime(now);
- waitPakin.setModiUser(userId);
- waitPakin.setModiTime(now);
- if (!waitPakinService.insert(waitPakin)) {
- throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
- }
- // 淇敼鎵撳寘鏁版嵁鐘舵��
- Pack pack = packService.selectByBarcode(detlDto.getOrderNo());
- pack.setSettle(2L);
- pack.setUpdateTime(now);
- pack.setUpdateBy(userId);
- if (!packService.updateById(pack)) {
- throw new CoolException("淇敼鎵撳寘鏁版嵁寮傚父");
- }
- }
-
- }
+// Mat analyse = MatUtils.analyseMat(elem.getMatnr());
+// // 鏉＄爜銆佺墿鏂欎唬鐮併�佸簭鍒楀彿銆佹暟閲�
+// DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(),analyse.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(),
+// elem.getBoxType1(),elem.getBoxType2(),elem.getBoxType3(), elem.getAnfme());
+//
+//// DetlDto detlDto = new DetlDto(elem.getMatnr(), analyse.getMatnr(), analyse.getBarcode(), elem.getAnfme());
+//// DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
+// if (DetlDto.has(detlDtos, detlDto)) {
+// DetlDto one = DetlDto.findDto(detlDtos, detlDto);
+// assert one != null;
+// one.setAnfme(one.getAnfme() + detlDto.getAnfme());
+// } else {
+// detlDtos.add(detlDto);
+// }
+// });
+//
+// if (packDown) {
+// MesCombParam mesCombParam = new MesCombParam();
+// mesCombParam.setZpallet(param.getBarcode());
+// mesCombParam.setPakinTime(DateUtils.convert(now));
+// mesCombParam.setLgort("5008");
+// mesCombParam.setPlantCode("5000");
+// mesCombParam.setFromCode("5012-20");
+// mesCombParam.setStationCode("JJQ-PFZPDB-XX");
+// for (DetlDto detlDto : detlDtos) {
+// mesCombParam.getList().add(new MesCombParam.Detl(detlDto.getOrderNo(), detlDto.getAnfme()));
+// }
+// String response = "";
+// boolean success = false;
+// try {
+// response = new HttpHandler.Builder()
+// .setUri(MesConstant.URL)
+// .setPath(MesConstant.PACK_DOWN_URL)
+// .setJson(JSON.toJSONString(mesCombParam))
+// .build()
+// .doPost();
+// JSONObject jsonObject = JSON.parseObject(response);
+// if (jsonObject.getInteger("code").equals(200)) {
+// success = true;
+// } else if (jsonObject.getInteger("code").equals(500)) {
+// log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
+// throw new CoolException(jsonObject.getString("msg"));
+// } else {
+// log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
+// throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+// }
+// } catch (Exception e) {
+// log.error("fail", e);
+// throw new CoolException(e.getMessage());
+// } finally {
+// try {
+// // 淇濆瓨鎺ュ彛鏃ュ織
+// apiLogService.save(
+// "鎵撳寘涓嬬嚎甯墭涓婃姤",
+// MesConstant.URL + MesConstant.PACK_DOWN_URL,
+// null,
+// "127.0.0.1",
+// JSON.toJSONString(mesCombParam),
+// response,
+// success
+// );
+// } catch (Exception e) { log.error("", e); }
+// }
+//
+// }
+//
+// // 鐢熸垚鍏ュ簱鍗曟嵁
+// String orderNo = "PACK" + snowflakeIdWorker.nextId();
+// OpenOrderPakinParam openParam = new OpenOrderPakinParam();
+// openParam.setOrderNo(orderNo);
+// openParam.setOrderTime(DateUtils.convert(now));
+// openParam.setOrderType("鎵撳寘鍏ュ簱鍗�");
+// openParam.setOrderDetails(detlDtos);
+// openService.pakinOrderCreate(openParam);
+//// Order order = orderService.selectByNo(orderNo);
+// Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, param.getOrderNo());
+//
+// if (null == order) {
+// throw new CoolException("鐢熸垚鍗曟嵁澶辫触");
+// }
+//// if (!orderService.updateSettle(order.getId(), 2L, userId)) {
+//// throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+//// }
+// OrderInAndOutUtil.updateOrder(Boolean.TRUE, order.getId(), 2L, userId);
+//
+// // 鐢熸垚鍏ュ簱閫氱煡妗�
+// for (DetlDto detlDto : detlDtos) {
+//
+// // 淇敼浣滀笟鏁伴噺 ----------------------------------------
+// // 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
+//// OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), detlDto.getMatnr(), detlDto.getBatch());
+// OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3()
+// ,detlDto.getBoxType1(),detlDto.getBoxType2(),detlDto.getBoxType3());
+// if (detlDto.getAnfme() > orderDetl.getEnableQty()) {
+// throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
+// }
+// // 淇敼璁㈠崟浣滀笟鏁伴噺
+//// if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+//// throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
+//// }
+// OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE,order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3()
+// ,detlDto.getBoxType1(),detlDto.getBoxType2(),detlDto.getBoxType3(), detlDto.getAnfme());
+// // 淇濆瓨鍏ュ簱閫氱煡妗�
+// Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+// if (Cools.isEmpty(mat)) {
+// throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+// }
+// WaitPakin waitPakin = new WaitPakin();
+// waitPakin.sync(mat);
+// waitPakin.setOrderNo(orderNo);
+// waitPakin.setBatch(detlDto.getBatch());
+// waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
+// waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+// waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
+// waitPakin.setStatus("Y"); // 鐘舵��
+// waitPakin.setAppeUser(userId);
+// waitPakin.setAppeTime(now);
+// waitPakin.setModiUser(userId);
+// waitPakin.setModiTime(now);
+// if (!waitPakinService.insert(waitPakin)) {
+// throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+// }
+// // 淇敼鎵撳寘鏁版嵁鐘舵��
+// Pack pack = packService.selectByBarcode(detlDto.getOrderNo());
+// pack.setSettle(2L);
+// pack.setUpdateTime(now);
+// pack.setUpdateBy(userId);
+// if (!packService.updateById(pack)) {
+// throw new CoolException("淇敼鎵撳寘鏁版嵁寮傚父");
+// }
+// }
+//
+// }
}
@Override
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 29dfc78..3bb606d 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -104,9 +104,9 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(),detail.getLineNumber(),detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(), detail.getLineNumber(), detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
if (DetlDto.hasLineNumber(list, dto)) {
- DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getLineNumber(),dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
+ DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getLineNumber(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
} else {
@@ -161,23 +161,23 @@
List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getQty()));
+ result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getLineNumber(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(), orderDetl.getQty()));
}
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
// if (!orderService.updateSettle(order.getId(), 6L, null)) {
// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(), 6L, null);
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 6L, null);
}
}
} else {
// 鎵�鏈夎鍗�
// List<Order> orders = orderService.selectBySettle(4L);
List<Order> orders = OrderInAndOutUtil.selectBySettle(null, 4L);
- if (orders.isEmpty()){
+ if (orders.isEmpty()) {
orders = new ArrayList<>();
}
for (Order order : orders) {
@@ -190,16 +190,16 @@
// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(),
+ result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getLineNumber(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(),
orderDetl.getQty()));
}
// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
// if (!orderService.updateSettle(order.getId(), 6L, null)) {
// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 6L, null);
}
}
@@ -264,11 +264,11 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(),detail.getLineNumber(),
- detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(), detail.getLineNumber(),
+ detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
if (DetlDto.hasLineNumber(list, dto)) {
- DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getLineNumber(),
- dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
+ DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getLineNumber(),
+ dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
} else {
@@ -321,15 +321,15 @@
// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(),order.getId());
for (OrderDetl orderDetl : orderDetls) {
result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getQty()));
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getLineNumber(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(), orderDetl.getQty()));
}
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
// if (!orderService.updateSettle(order.getId(), 6L, null)) {
// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 6L, null);
}
}
} else {
@@ -345,15 +345,15 @@
List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getQty()));
+ result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getLineNumber(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(), orderDetl.getQty()));
}
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
// if (!orderService.updateSettle(order.getId(), 6L, null)) {
// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 6L, null);
}
}
return results;
@@ -483,12 +483,12 @@
@Override
@Transactional
public void syncMat(MatSyncParam param) {
- if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <=0 ) {
+ if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <= 0) {
throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
}
- for(MatSyncParam.MatParam matParam : param.getMatDetails()){
- if(Cools.isEmpty(matParam.getMatnr())){
+ for (MatSyncParam.MatParam matParam : param.getMatDetails()) {
+ if (Cools.isEmpty(matParam.getMatnr())) {
throw new CoolException("鍟嗗搧缂栫爜涓嶈兘涓虹┖");
}
@@ -500,7 +500,7 @@
Long tagId;
// 涓�绾у垎绫�
if (!Cools.isEmpty(matParam.getGroupCode()) && !Cools.isEmpty(matParam.getGroupName())) {
- Tag priTag = tagService.selectByName(matParam.getGroupCode(), 2);
+ Tag priTag = tagService.selectOne(new EntityWrapper<Tag>().eq("name", matParam.getGroupCode()));
if (priTag == null) {
Tag top = tagService.getTop();
NodeUtils nodeUtils = new NodeUtils();
@@ -565,10 +565,6 @@
tagId = tagService.getTop().getId();
}
mat.sync(matParam);
-// mat.setMatnr(param.getMatnr());
-// mat.setMaktx(param.getMaktx());
-// mat.setSpecs(param.getSpecs());
-// mat.setModel(param.getModel());
mat.setTagId(tagId);
mat.setStatus(1);
@@ -581,7 +577,7 @@
}
} else {
mat.sync(matParam);
- if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
+ if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr()))) {
throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
}
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 dc7520a..d01e15d 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -10,14 +10,18 @@
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.service.ReportToThirdService;
-import com.zy.common.utils.HttpHandler;
+import com.zy.nc.SendUtil;
+import com.zy.nc.util.NcResultMessage;
+import com.zy.nc.vo.SaleOutBodyVO;
+import com.zy.nc.vo.SaleOutHeadVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import java.io.IOException;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
@Service
@Slf4j
@@ -42,62 +46,70 @@
@Override
public void report(Order order, List<OrderDetl> orderDetls, DocType docType) {
Boolean http = false;
- switch (order.getDocType().toString()) {
- case "閿�鍞彂璐�":
- http = http("", docType.getDocName(), nyncIp + port, saveRefDelivery);
- if (Cools.isEmpty(order.getShipCode()) || order.getShipCode().equalsIgnoreCase("1")) {
-
- }
- break;
- case "浜ф垚鍝佸叆搴�":
- break;
- case "杈呮枡閲囪喘鍏ュ簱":
- break;
- case "杈呮枡鍙婃垚鍝佽浆搴�":
- break;
- case "鑷姩鍖呰鍏ュ簱":
- break;
- case "鍐呴儴璋冩嫧":
- break;
- default:
- break;
- }
- if (http) {
- // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ NcResultMessage response = null;
+ try {
+ switch (order.getDocType().toString()) {
+ case "閿�鍞彂璐�":
+ //缁勮瀵硅薄鏁版嵁
+ Map<String, Object> data = new HashMap<String, Object>();
+ SaleOutHeadVO saleOutHeadVO = new SaleOutHeadVO();
+ saleOutHeadVO.setPk_org("FYT");
+ saleOutHeadVO.setCwarehouseid("6101");
+ SaleOutBodyVO saleOutBodyVO = null;
+ for (OrderDetl orderDetl : orderDetls) {
+ saleOutBodyVO = new SaleOutBodyVO();
+ saleOutBodyVO.setCsourcebillhid("1001A1100000027XNSH2");
+ saleOutBodyVO.setCsourcebillbid("1001A1100000027YFC8U");
+ saleOutBodyVO.setCsourcetype("4331-01");
+ }
+ data.put("saleOutHeadVO", saleOutHeadVO);
+ data.put("saleOutBodyVO", saleOutBodyVO);
+ //鍙戦�佽姹�
+ response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + port, saveRefDelivery, JSONObject.toJSONString(data));
+ if (!Cools.isEmpty(response) && response.isSuccess()) {
+ log.info("response:{}", response);
+ http = true;
+ }
+ break;
+ case "浜ф垚鍝佸叆搴�":
+ break;
+ case "杈呮枡閲囪喘鍏ュ簱":
+ break;
+ case "杈呮枡鍙婃垚鍝佽浆搴�":
+ break;
+ case "鑷姩鍖呰鍏ュ簱":
+ break;
+ case "鍐呴儴璋冩嫧":
+ break;
+ default:
+ break;
}
+ if (http) {
+ // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+ if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+ } catch (Exception e) {
+ throw new CoolException("璋冪敤鎺ュ彛鎶ラ敊锛岃鑱旂郴绠＄悊鍛�");
+ } finally {
+ reportApiLog(response, order.getDocType$(), nyncIp, saveRefDelivery);
}
+
}
- private Boolean http(Object data, String docType, String url, String path) {
+ private Boolean reportApiLog(Object data, String docType, String url, String path) {
String response = "";
boolean success = false;
- try {
- response = new HttpHandler.Builder()
- .setUri(url)
- .setPath(path)
- .setJson(JSON.toJSONString(data))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(1)) {
- return true;
- }
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", url + path, JSON.toJSONString(data), response);
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- apiLogService.save(
- docType,
- url + path,
- null,
- "127.0.0.1",
- JSON.toJSONString(data),
- response,
- success
- );
- }
+ apiLogService.save(
+ docType,
+ url + path,
+ null,
+ "127.0.0.1",
+ JSON.toJSONString(data),
+ response,
+ success
+ );
return false;
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/TagServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TagServiceImpl.java
index e8255ae..93b2ee9 100644
--- a/src/main/java/com/zy/asrs/service/impl/TagServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TagServiceImpl.java
@@ -33,4 +33,6 @@
public Tag selectByName(String name, Integer level) {
return this.selectOne(new EntityWrapper<Tag>().eq("name", name).eq("level", level));
}
+
+
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 85cab5c..b0a687a 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -1,25 +1,24 @@
package com.zy.asrs.task.handler;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.service.*;
+import com.zy.asrs.service.DocTypeService;
+import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.service.OrderService;
+import com.zy.asrs.service.ReportToThirdService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.DetlDto;
-import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -168,7 +167,11 @@
return SUCCESS;
}
List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
- reportToThirdService.report(order, orderDetls, docType);
+ try {
+ reportToThirdService.report(order, orderDetls, docType);
+ } catch (Exception e) {
+ return FAIL;
+ }
return SUCCESS;
}
diff --git a/src/main/java/com/zy/common/config/ds/DataSourceAop.java b/src/main/java/com/zy/common/config/ds/DataSourceAop.java
index 98c2d56..4de4666 100644
--- a/src/main/java/com/zy/common/config/ds/DataSourceAop.java
+++ b/src/main/java/com/zy/common/config/ds/DataSourceAop.java
@@ -9,19 +9,19 @@
public class DataSourceAop {
@Before("execution(* com.zy.asrs..*(..))")
public void setDataSource2test01() {
- System.err.println("test01涓氬姟");
+ //System.err.println("test01涓氬姟");
DataSourceType.setDataBaseType(DataSourceType.DataBaseType.TEST01);
}
@Before("execution(* com.zy.system..*(..))")
public void setDataSource2test012() {
- System.err.println("test01涓氬姟");
+ //System.err.println("test01涓氬姟");
DataSourceType.setDataBaseType(DataSourceType.DataBaseType.TEST01);
}
@Before("execution(* com.zy.nc..*(..))")
public void setDataSource2test02() {
- System.err.println("test02涓氬姟");
+ //System.err.println("test02涓氬姟");
DataSourceType.setDataBaseType(DataSourceType.DataBaseType.TEST02);
}
}
diff --git a/src/main/java/com/zy/common/config/ds/DataSourceType.java b/src/main/java/com/zy/common/config/ds/DataSourceType.java
index d64f307..57ce62b 100644
--- a/src/main/java/com/zy/common/config/ds/DataSourceType.java
+++ b/src/main/java/com/zy/common/config/ds/DataSourceType.java
@@ -14,14 +14,14 @@
if (dataBaseType == null) {
throw new NullPointerException();
}
- System.err.println("[灏嗗綋鍓嶆暟鎹簮鏀逛负]锛�" + dataBaseType);
+ //System.err.println("[灏嗗綋鍓嶆暟鎹簮鏀逛负]锛�" + dataBaseType);
TYPE.set(dataBaseType);
}
// 鑾峰彇鏁版嵁婧愮被鍨�
public static DataBaseType getDataBaseType() {
DataBaseType dataBaseType = TYPE.get() == null ? DataBaseType.TEST01 : TYPE.get();
- System.err.println("[鑾峰彇褰撳墠鏁版嵁婧愮殑绫诲瀷涓篯锛�" + dataBaseType);
+ //System.err.println("[鑾峰彇褰撳墠鏁版嵁婧愮殑绫诲瀷涓篯锛�" + dataBaseType);
return dataBaseType;
}
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index d7168d0..9e49ea2 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -27,9 +27,9 @@
private Long lineNumber = 1L;
- private String boxType1 = "1";
- private String boxType2 = "1";
- private String boxType3 = "1";
+ private String boxType1 = "";
+ private String boxType2 = "";
+ private String boxType3 = "";
private Double anfme;
@@ -133,7 +133,7 @@
&& Cools.eq(dto.getBrand(), orderDetl.getBrand()) && Cools.eq(dto.getStandby1(), orderDetl.getStandby1())
&& Cools.eq(dto.getStandby2(), orderDetl.getStandby2()) && Cools.eq(dto.getStandby3(), orderDetl.getStandby3())
&& Cools.eq(dto.getBoxType1(), orderDetl.getBoxType1()) && Cools.eq(dto.getBoxType2(), orderDetl.getBoxType2())
- && Cools.eq(dto.getBoxType3(), orderDetl.getBoxType3()) ) {
+ && Cools.eq(dto.getBoxType3(), orderDetl.getBoxType3())) {
return true;
}
// }
@@ -159,7 +159,7 @@
&& Cools.eq(dto.getStandby2(), orderDetl.getStandby2()) && Cools.eq(dto.getStandby3(), orderDetl.getStandby3())
&& dto.getLineNumber().equals(orderDetl.getLineNumber())
&& Cools.eq(dto.getBoxType1(), orderDetl.getBoxType1()) && Cools.eq(dto.getBoxType2(), orderDetl.getBoxType2())
- && Cools.eq(dto.getBoxType3(), orderDetl.getBoxType3()) ) {
+ && Cools.eq(dto.getBoxType3(), orderDetl.getBoxType3())) {
return true;
}
// }
@@ -174,7 +174,7 @@
&& Cools.eq(dto.getBrand(), orderDetl.getBrand()) && Cools.eq(dto.getStandby1(), orderDetl.getStandby1())
&& Cools.eq(dto.getStandby2(), orderDetl.getStandby2()) && Cools.eq(dto.getStandby3(), orderDetl.getStandby3())
&& Cools.eq(dto.getBoxType1(), orderDetl.getBoxType1()) && Cools.eq(dto.getBoxType2(), orderDetl.getBoxType2())
- && Cools.eq(dto.getBoxType3(), orderDetl.getBoxType3()) ) {
+ && Cools.eq(dto.getBoxType3(), orderDetl.getBoxType3())) {
return true;
}
}
@@ -187,7 +187,7 @@
&& Cools.eq(dto.getBrand(), orderDetl.getBrand()) && Cools.eq(dto.getStandby1(), orderDetl.getStandby1())
&& Cools.eq(dto.getStandby2(), orderDetl.getStandby2()) && Cools.eq(dto.getStandby3(), orderDetl.getStandby3())
&& Cools.eq(dto.getBoxType1(), orderDetl.getBoxType1()) && Cools.eq(dto.getBoxType2(), orderDetl.getBoxType2())
- && Cools.eq(dto.getBoxType3(), orderDetl.getBoxType3()) ) {
+ && Cools.eq(dto.getBoxType3(), orderDetl.getBoxType3())) {
return true;
}
}
@@ -200,7 +200,7 @@
&& Cools.eq(dto.getBrand(), detlDto.getBrand()) && Cools.eq(dto.getStandby1(), detlDto.getStandby1())
&& Cools.eq(dto.getStandby2(), detlDto.getStandby2()) && Cools.eq(dto.getStandby3(), detlDto.getStandby3())
&& Cools.eq(dto.getBoxType1(), detlDto.getBoxType1()) && Cools.eq(dto.getBoxType2(), detlDto.getBoxType2())
- && Cools.eq(dto.getBoxType3(), detlDto.getBoxType3()) ) {
+ && Cools.eq(dto.getBoxType3(), detlDto.getBoxType3())) {
return true;
}
}
@@ -214,7 +214,7 @@
&& Cools.eq(dto.getStandby2(), detlDto.getStandby2()) && Cools.eq(dto.getStandby3(), detlDto.getStandby3())
&& dto.getLineNumber().equals(detlDto.getLineNumber())
&& Cools.eq(dto.getBoxType1(), detlDto.getBoxType1()) && Cools.eq(dto.getBoxType2(), detlDto.getBoxType2())
- && Cools.eq(dto.getBoxType3(), detlDto.getBoxType3()) ) {
+ && Cools.eq(dto.getBoxType3(), detlDto.getBoxType3())) {
return true;
}
}
@@ -237,7 +237,7 @@
return null;
}
- public static DetlDto findLineNumber(List<DetlDto> detlDtos, String matnr, String batch, String brand, String standby1, String standby2, String standby3,Long lineNumber, String boxType1, String boxType2, String boxType3) {
+ public static DetlDto findLineNumber(List<DetlDto> detlDtos, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber, String boxType1, String boxType2, String boxType3) {
if (Cools.isEmpty(matnr)) {
return null;
}
@@ -254,7 +254,7 @@
return null;
}
- public static DetlDto findDto(List<DetlDto> detlDtos,DetlDto detlDtoB) {
+ public static DetlDto findDto(List<DetlDto> detlDtos, DetlDto detlDtoB) {
if (Cools.isEmpty(detlDtoB)) {
return null;
}
diff --git a/src/main/java/com/zy/nc/Test.java b/src/main/java/com/zy/nc/SendUtil.java
similarity index 80%
rename from src/main/java/com/zy/nc/Test.java
rename to src/main/java/com/zy/nc/SendUtil.java
index 38a96ae..5db13b4 100644
--- a/src/main/java/com/zy/nc/Test.java
+++ b/src/main/java/com/zy/nc/SendUtil.java
@@ -21,7 +21,7 @@
* @author lizhmf
* @date 2019骞�6鏈�20鏃ヤ笂鍗�10:53:11
*/
-public class Test {
+public class SendUtil {
// app_secret
private static String client_secret = null;
@@ -70,10 +70,88 @@
}
System.out.println("getTokenData:" + token);
// 娴嬭瘯openapi
- testApi(token);
+ //sendDataToNc(token);
} catch (Exception e) {
e.printStackTrace();
}
+ }
+
+ /**
+ * 璇锋眰openapi
+ *
+ * @param token
+ * @throws Exception
+ */
+ public static NcResultMessage sendDataToNc(String token, String baseUrl, String apiUrl, String requestBody) {
+ if (token == null) {
+ try {
+ token = getToken();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ // token杞璞★紝鑾峰彇api璁块棶鎵�鐢╰oken鍜宻ecret
+ NcResultMessage returnData = JSONObject.parseObject(token, NcResultMessage.class);
+ if (returnData.isSuccess()) {
+ JSONObject data = JSONObject.parseObject(returnData.getData().toString());
+ String access_token = (String) data.get("access_token");
+ String security_key = (String) data.get("security_key");
+ String refresh_token = (String) data.get("refresh_token");
+ Long expire_in = data.getLong("expires_in");
+ Long ts = data.getLong("ts");
+ if (ts + expire_in < System.currentTimeMillis()) {
+ try {
+ token = getToken();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ data = JSONObject.parseObject(token.getBytes(), NcResultMessage.class);
+ access_token = (String) data.get("access_token");
+ security_key = (String) data.get("security_key");
+ refresh_token = (String) data.get("refresh_token");
+ }
+ System.out.println("銆怉CCESS_TOKEN銆�:" + access_token);
+ // 璇锋眰璺緞
+ String url = baseUrl + apiUrl;
+ // header 鍙傛暟
+ Map<String, String> headermap = new HashMap<>();
+ headermap.put("access_token", access_token);
+ headermap.put("client_id", client_id);
+ StringBuffer sb = new StringBuffer();
+ sb.append(client_id);
+ if (!Cools.isEmpty(requestBody)) {
+ // sb.append(requestBody.replaceAll("\\s*|\t|\r|\n", "").trim());
+ sb.append(requestBody);
+ }
+ sb.append(pubKey);
+ String sign = SHA256Util.getSHA256(sb.toString(), pubKey);
+ headermap.put("signature", sign);
+ if (!Cools.isEmpty(busi_id)) {
+ headermap.put("busi_id", busi_id);
+ }
+ if (!Cools.isEmpty(repeat_check)) {
+ headermap.put("repeat_check", repeat_check);
+ }
+ // headermap.put("ucg_flag", "y");
+ String mediaType = "application/json;charset=utf-8";
+ // 琛ㄤ綋鏁版嵁json
+ // 鏍规嵁瀹夊叏绾у埆閫夋嫨鍔犲瘑鎴栧帇缂╄姹傝〃浣撳弬鏁�
+ String json = null;
+ String result;
+ String result2;
+ try {
+ json = dealRequestBody(requestBody, security_key, secret_level);
+ // 杩斿洖鍊�
+ result = doPost(url, null, mediaType, headermap, json);
+ result2 = dealResponseBody(result, security_key, secret_level);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ System.out.println("銆怰ESULT銆�:" + result);
+ System.out.println("result瑙ｅ瘑:" + result2);
+ return JSONObject.parseObject(result2, NcResultMessage.class);
+ }
+ return null;
}
/**
@@ -161,68 +239,6 @@
return token;
}
- /**
- * 璇锋眰openapi
- *
- * @param token
- * @throws Exception
- */
- private static void testApi(String token) throws Exception {
- // token杞璞★紝鑾峰彇api璁块棶鎵�鐢╰oken鍜宻ecret
- ResultMessageUtil returnData = JSONObject.parseObject(token, ResultMessageUtil.class);
- Map<String, Object> data = (Map<String, Object>) returnData.getData();
- String access_token = (String) data.get("access_token");
- String security_key = (String) data.get("security_key");
- String refresh_token = (String) data.get("refresh_token");
- long expire_in = new Double((double) data.get("expires_in")).longValue();
- long ts = new Double((double) data.get("ts")).longValue();
- if (ts + expire_in < System.currentTimeMillis()) {
- token = getToken();
- returnData = JSONObject.parseObject(token, ResultMessageUtil.class);
- data = (Map<String, Object>) returnData.getData();
- access_token = (String) data.get("access_token");
- security_key = (String) data.get("security_key");
- refresh_token = (String) data.get("refresh_token");
- }
- System.out.println("銆怉CCESS_TOKEN銆�:" + access_token);
-
- // 璇锋眰璺緞
- String url = baseUrl + apiUrl;
- // header 鍙傛暟
- Map<String, String> headermap = new HashMap<>();
- headermap.put("access_token", access_token);
- headermap.put("client_id", client_id);
-
- StringBuffer sb = new StringBuffer();
- sb.append(client_id);
- if (!Cools.isEmpty(requestBody)) {
- // sb.append(requestBody.replaceAll("\\s*|\t|\r|\n", "").trim());
- sb.append(requestBody);
- }
- sb.append(pubKey);
- String sign = SHA256Util.getSHA256(sb.toString(), pubKey);
- headermap.put("signature", sign);
-
- if (!Cools.isEmpty(busi_id)) {
- headermap.put("busi_id", busi_id);
- }
- if (!Cools.isEmpty(repeat_check)) {
- headermap.put("repeat_check", repeat_check);
- }
-// headermap.put("ucg_flag", "y");
-
- String mediaType = "application/json;charset=utf-8";
-
- // 琛ㄤ綋鏁版嵁json
- // 鏍规嵁瀹夊叏绾у埆閫夋嫨鍔犲瘑鎴栧帇缂╄姹傝〃浣撳弬鏁�
- String json = dealRequestBody(requestBody, security_key, secret_level);
-
- // 杩斿洖鍊�
- String result = doPost(url, null, mediaType, headermap, json);
- String result2 = dealResponseBody(result, security_key, secret_level);
- System.out.println("銆怰ESULT銆�:" + result);
- System.out.println("result瑙ｅ瘑:" + result2);
- }
/**
* 杩斿洖鍊艰繘琛岃繃鍔犲瘑鍜屽帇缂╋紝瀵硅繑鍥炲�艰繘琛岃В鍘嬪拰瑙ｅ瘑
diff --git a/src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java b/src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java
index 612aa6c..e592836 100644
--- a/src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java
+++ b/src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java
@@ -177,7 +177,7 @@
/**
*
*/
- private BigDecimal nastnum;
+ private Double nastnum;
/**
*
diff --git a/src/main/java/com/zy/nc/entity/NccScZkmxbWms.java b/src/main/java/com/zy/nc/entity/NccScZkmxbWms.java
index 16ee58a..6c49564 100644
--- a/src/main/java/com/zy/nc/entity/NccScZkmxbWms.java
+++ b/src/main/java/com/zy/nc/entity/NccScZkmxbWms.java
@@ -1,289 +1,308 @@
package com.zy.nc.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
-import java.math.BigDecimal;
-import java.util.Date;
import lombok.Data;
+import java.math.BigDecimal;
+import java.util.Date;
+
/**
- *
* @TableName ncc_sc_zkmxb_wms
*/
-@TableName(value ="ncc_sc_zkmxb_wms")
+@TableName(value = "ncc_sc_zkmxb_wms")
@Data
public class NccScZkmxbWms {
/**
- *
+ *
*/
@TableId
private String cspecialbid;
/**
- *
+ *
*/
private String vbillcode;
/**
- *
+ *
*/
private String dmakedate;
/**
- *
+ *
*/
private Date scdmakedate;
/**
- *
+ *
*/
private String dbilldate;
/**
- *
+ *
*/
private String taudittime;
/**
- *
+ *
*/
private String zzbm;
/**
- *
+ *
*/
private String zzmc;
/**
- *
+ *
*/
private String ckzzbm;
/**
- *
+ *
*/
private String ckzzmc;
/**
- *
+ *
*/
private String ckssbcode;
/**
- *
+ *
*/
private String cksssyb;
/**
- *
+ *
*/
private String ckckbm;
/**
- *
+ *
*/
private String ckckmc;
/**
- *
+ *
*/
private String ckbmbm;
/**
- *
+ *
*/
private String ckbmmc;
/**
- *
+ *
*/
private String rkzzbm;
/**
- *
+ *
*/
private String rkzzmc;
/**
- *
+ *
*/
private String rkssbcode;
/**
- *
+ *
*/
private String rksssyb;
/**
- *
+ *
*/
private String rkckbm;
/**
- *
+ *
*/
private String rkckmc;
/**
- *
+ *
*/
private String rkbmbm;
/**
- *
+ *
*/
private String rkbmmc;
/**
- *
+ *
*/
private Long djzt;
/**
- *
+ *
*/
private String zklx;
/**
- *
+ *
*/
private String wlbm;
/**
- *
+ *
*/
private String wlmc;
/**
- *
+ *
*/
private String wlgg;
/**
- *
+ *
*/
private String wlxh;
/**
- *
+ *
*/
private String wljc;
/**
- *
+ *
*/
private String jbflbm;
/**
- *
+ *
*/
private String jbflmc;
/**
- *
+ *
*/
private String sjflbm;
/**
- *
+ *
*/
private String sjflmc;
/**
- *
+ *
*/
private String zsjflbm;
/**
- *
+ *
*/
private String zsjflmc;
/**
- *
+ *
*/
private String zdw;
/**
- *
+ *
*/
private String fdw;
/**
- *
+ *
*/
private String kczt;
/**
- *
+ *
*/
private String vbatchcode;
/**
- *
+ *
*/
private String vdef1;
/**
- *
+ *
*/
private String vdef2;
/**
- *
+ *
*/
private String vdef3;
/**
- *
+ *
*/
private String khbm;
/**
- *
+ *
*/
private String khmc;
/**
- *
+ *
*/
private String khjc;
/**
- *
+ *
*/
private BigDecimal yzzsl;
/**
- *
+ *
*/
private BigDecimal yzfsl;
/**
- *
+ *
*/
private BigDecimal ljckzsl;
/**
- *
+ *
*/
private BigDecimal ljrkzsl;
/**
- *
+ *
*/
private Integer dr;
/**
- *
+ *
*/
private String ts;
/**
- *
+ *
*/
private Integer wmsFlag;
+
+ /**
+ *
+ */
+ private Double yingzsl;
+
+ /**
+ *
+ */
+ private Double yingzzsl;
+
+ /**
+ *
+ */
+ private Integer bdr;
+
+ /**
+ *
+ */
+ private String bts;
@Override
public boolean equals(Object that) {
@@ -297,60 +316,7 @@
return false;
}
NccScZkmxbWms other = (NccScZkmxbWms) that;
- return (this.getCspecialbid() == null ? other.getCspecialbid() == null : this.getCspecialbid().equals(other.getCspecialbid()))
- && (this.getVbillcode() == null ? other.getVbillcode() == null : this.getVbillcode().equals(other.getVbillcode()))
- && (this.getDmakedate() == null ? other.getDmakedate() == null : this.getDmakedate().equals(other.getDmakedate()))
- && (this.getScdmakedate() == null ? other.getScdmakedate() == null : this.getScdmakedate().equals(other.getScdmakedate()))
- && (this.getDbilldate() == null ? other.getDbilldate() == null : this.getDbilldate().equals(other.getDbilldate()))
- && (this.getTaudittime() == null ? other.getTaudittime() == null : this.getTaudittime().equals(other.getTaudittime()))
- && (this.getZzbm() == null ? other.getZzbm() == null : this.getZzbm().equals(other.getZzbm()))
- && (this.getZzmc() == null ? other.getZzmc() == null : this.getZzmc().equals(other.getZzmc()))
- && (this.getCkzzbm() == null ? other.getCkzzbm() == null : this.getCkzzbm().equals(other.getCkzzbm()))
- && (this.getCkzzmc() == null ? other.getCkzzmc() == null : this.getCkzzmc().equals(other.getCkzzmc()))
- && (this.getCkssbcode() == null ? other.getCkssbcode() == null : this.getCkssbcode().equals(other.getCkssbcode()))
- && (this.getCksssyb() == null ? other.getCksssyb() == null : this.getCksssyb().equals(other.getCksssyb()))
- && (this.getCkckbm() == null ? other.getCkckbm() == null : this.getCkckbm().equals(other.getCkckbm()))
- && (this.getCkckmc() == null ? other.getCkckmc() == null : this.getCkckmc().equals(other.getCkckmc()))
- && (this.getCkbmbm() == null ? other.getCkbmbm() == null : this.getCkbmbm().equals(other.getCkbmbm()))
- && (this.getCkbmmc() == null ? other.getCkbmmc() == null : this.getCkbmmc().equals(other.getCkbmmc()))
- && (this.getRkzzbm() == null ? other.getRkzzbm() == null : this.getRkzzbm().equals(other.getRkzzbm()))
- && (this.getRkzzmc() == null ? other.getRkzzmc() == null : this.getRkzzmc().equals(other.getRkzzmc()))
- && (this.getRkssbcode() == null ? other.getRkssbcode() == null : this.getRkssbcode().equals(other.getRkssbcode()))
- && (this.getRksssyb() == null ? other.getRksssyb() == null : this.getRksssyb().equals(other.getRksssyb()))
- && (this.getRkckbm() == null ? other.getRkckbm() == null : this.getRkckbm().equals(other.getRkckbm()))
- && (this.getRkckmc() == null ? other.getRkckmc() == null : this.getRkckmc().equals(other.getRkckmc()))
- && (this.getRkbmbm() == null ? other.getRkbmbm() == null : this.getRkbmbm().equals(other.getRkbmbm()))
- && (this.getRkbmmc() == null ? other.getRkbmmc() == null : this.getRkbmmc().equals(other.getRkbmmc()))
- && (this.getDjzt() == null ? other.getDjzt() == null : this.getDjzt().equals(other.getDjzt()))
- && (this.getZklx() == null ? other.getZklx() == null : this.getZklx().equals(other.getZklx()))
- && (this.getWlbm() == null ? other.getWlbm() == null : this.getWlbm().equals(other.getWlbm()))
- && (this.getWlmc() == null ? other.getWlmc() == null : this.getWlmc().equals(other.getWlmc()))
- && (this.getWlgg() == null ? other.getWlgg() == null : this.getWlgg().equals(other.getWlgg()))
- && (this.getWlxh() == null ? other.getWlxh() == null : this.getWlxh().equals(other.getWlxh()))
- && (this.getWljc() == null ? other.getWljc() == null : this.getWljc().equals(other.getWljc()))
- && (this.getJbflbm() == null ? other.getJbflbm() == null : this.getJbflbm().equals(other.getJbflbm()))
- && (this.getJbflmc() == null ? other.getJbflmc() == null : this.getJbflmc().equals(other.getJbflmc()))
- && (this.getSjflbm() == null ? other.getSjflbm() == null : this.getSjflbm().equals(other.getSjflbm()))
- && (this.getSjflmc() == null ? other.getSjflmc() == null : this.getSjflmc().equals(other.getSjflmc()))
- && (this.getZsjflbm() == null ? other.getZsjflbm() == null : this.getZsjflbm().equals(other.getZsjflbm()))
- && (this.getZsjflmc() == null ? other.getZsjflmc() == null : this.getZsjflmc().equals(other.getZsjflmc()))
- && (this.getZdw() == null ? other.getZdw() == null : this.getZdw().equals(other.getZdw()))
- && (this.getFdw() == null ? other.getFdw() == null : this.getFdw().equals(other.getFdw()))
- && (this.getKczt() == null ? other.getKczt() == null : this.getKczt().equals(other.getKczt()))
- && (this.getVbatchcode() == null ? other.getVbatchcode() == null : this.getVbatchcode().equals(other.getVbatchcode()))
- && (this.getVdef1() == null ? other.getVdef1() == null : this.getVdef1().equals(other.getVdef1()))
- && (this.getVdef2() == null ? other.getVdef2() == null : this.getVdef2().equals(other.getVdef2()))
- && (this.getVdef3() == null ? other.getVdef3() == null : this.getVdef3().equals(other.getVdef3()))
- && (this.getKhbm() == null ? other.getKhbm() == null : this.getKhbm().equals(other.getKhbm()))
- && (this.getKhmc() == null ? other.getKhmc() == null : this.getKhmc().equals(other.getKhmc()))
- && (this.getKhjc() == null ? other.getKhjc() == null : this.getKhjc().equals(other.getKhjc()))
- && (this.getYzzsl() == null ? other.getYzzsl() == null : this.getYzzsl().equals(other.getYzzsl()))
- && (this.getYzfsl() == null ? other.getYzfsl() == null : this.getYzfsl().equals(other.getYzfsl()))
- && (this.getLjckzsl() == null ? other.getLjckzsl() == null : this.getLjckzsl().equals(other.getLjckzsl()))
- && (this.getLjrkzsl() == null ? other.getLjrkzsl() == null : this.getLjrkzsl().equals(other.getLjrkzsl()))
- && (this.getDr() == null ? other.getDr() == null : this.getDr().equals(other.getDr()))
- && (this.getTs() == null ? other.getTs() == null : this.getTs().equals(other.getTs()))
- && (this.getWmsFlag() == null ? other.getWmsFlag() == null : this.getWmsFlag().equals(other.getWmsFlag()));
+ return (this.getCspecialbid() == null ? other.getCspecialbid() == null : this.getCspecialbid().equals(other.getCspecialbid())) && (this.getVbillcode() == null ? other.getVbillcode() == null : this.getVbillcode().equals(other.getVbillcode())) && (this.getDmakedate() == null ? other.getDmakedate() == null : this.getDmakedate().equals(other.getDmakedate())) && (this.getScdmakedate() == null ? other.getScdmakedate() == null : this.getScdmakedate().equals(other.getScdmakedate())) && (this.getDbilldate() == null ? other.getDbilldate() == null : this.getDbilldate().equals(other.getDbilldate())) && (this.getTaudittime() == null ? other.getTaudittime() == null : this.getTaudittime().equals(other.getTaudittime())) && (this.getZzbm() == null ? other.getZzbm() == null : this.getZzbm().equals(other.getZzbm())) && (this.getZzmc() == null ? other.getZzmc() == null : this.getZzmc().equals(other.getZzmc())) && (this.getCkzzbm() == null ? other.getCkzzbm() == null : this.getCkzzbm().equals(other.getCkzzbm())) && (this.getCkzzmc() == null ? other.getCkzzmc() == null : this.getCkzzmc().equals(other.getCkzzmc())) && (this.getCkssbcode() == null ? other.getCkssbcode() == null : this.getCkssbcode().equals(other.getCkssbcode())) && (this.getCksssyb() == null ? other.getCksssyb() == null : this.getCksssyb().equals(other.getCksssyb())) && (this.getCkckbm() == null ? other.getCkckbm() == null : this.getCkckbm().equals(other.getCkckbm())) && (this.getCkckmc() == null ? other.getCkckmc() == null : this.getCkckmc().equals(other.getCkckmc())) && (this.getCkbmbm() == null ? other.getCkbmbm() == null : this.getCkbmbm().equals(other.getCkbmbm())) && (this.getCkbmmc() == null ? other.getCkbmmc() == null : this.getCkbmmc().equals(other.getCkbmmc())) && (this.getRkzzbm() == null ? other.getRkzzbm() == null : this.getRkzzbm().equals(other.getRkzzbm())) && (this.getRkzzmc() == null ? other.getRkzzmc() == null : this.getRkzzmc().equals(other.getRkzzmc())) && (this.getRkssbcode() == null ? other.getRkssbcode() == null : this.getRkssbcode().equals(other.getRkssbcode())) && (this.getRksssyb() == null ? other.getRksssyb() == null : this.getRksssyb().equals(other.getRksssyb())) && (this.getRkckbm() == null ? other.getRkckbm() == null : this.getRkckbm().equals(other.getRkckbm())) && (this.getRkckmc() == null ? other.getRkckmc() == null : this.getRkckmc().equals(other.getRkckmc())) && (this.getRkbmbm() == null ? other.getRkbmbm() == null : this.getRkbmbm().equals(other.getRkbmbm())) && (this.getRkbmmc() == null ? other.getRkbmmc() == null : this.getRkbmmc().equals(other.getRkbmmc())) && (this.getDjzt() == null ? other.getDjzt() == null : this.getDjzt().equals(other.getDjzt())) && (this.getZklx() == null ? other.getZklx() == null : this.getZklx().equals(other.getZklx())) && (this.getWlbm() == null ? other.getWlbm() == null : this.getWlbm().equals(other.getWlbm())) && (this.getWlmc() == null ? other.getWlmc() == null : this.getWlmc().equals(other.getWlmc())) && (this.getWlgg() == null ? other.getWlgg() == null : this.getWlgg().equals(other.getWlgg())) && (this.getWlxh() == null ? other.getWlxh() == null : this.getWlxh().equals(other.getWlxh())) && (this.getWljc() == null ? other.getWljc() == null : this.getWljc().equals(other.getWljc())) && (this.getJbflbm() == null ? other.getJbflbm() == null : this.getJbflbm().equals(other.getJbflbm())) && (this.getJbflmc() == null ? other.getJbflmc() == null : this.getJbflmc().equals(other.getJbflmc())) && (this.getSjflbm() == null ? other.getSjflbm() == null : this.getSjflbm().equals(other.getSjflbm())) && (this.getSjflmc() == null ? other.getSjflmc() == null : this.getSjflmc().equals(other.getSjflmc())) && (this.getZsjflbm() == null ? other.getZsjflbm() == null : this.getZsjflbm().equals(other.getZsjflbm())) && (this.getZsjflmc() == null ? other.getZsjflmc() == null : this.getZsjflmc().equals(other.getZsjflmc())) && (this.getZdw() == null ? other.getZdw() == null : this.getZdw().equals(other.getZdw())) && (this.getFdw() == null ? other.getFdw() == null : this.getFdw().equals(other.getFdw())) && (this.getKczt() == null ? other.getKczt() == null : this.getKczt().equals(other.getKczt())) && (this.getVbatchcode() == null ? other.getVbatchcode() == null : this.getVbatchcode().equals(other.getVbatchcode())) && (this.getVdef1() == null ? other.getVdef1() == null : this.getVdef1().equals(other.getVdef1())) && (this.getVdef2() == null ? other.getVdef2() == null : this.getVdef2().equals(other.getVdef2())) && (this.getVdef3() == null ? other.getVdef3() == null : this.getVdef3().equals(other.getVdef3())) && (this.getKhbm() == null ? other.getKhbm() == null : this.getKhbm().equals(other.getKhbm())) && (this.getKhmc() == null ? other.getKhmc() == null : this.getKhmc().equals(other.getKhmc())) && (this.getKhjc() == null ? other.getKhjc() == null : this.getKhjc().equals(other.getKhjc())) && (this.getYzzsl() == null ? other.getYzzsl() == null : this.getYzzsl().equals(other.getYzzsl())) && (this.getYzfsl() == null ? other.getYzfsl() == null : this.getYzfsl().equals(other.getYzfsl())) && (this.getLjckzsl() == null ? other.getLjckzsl() == null : this.getLjckzsl().equals(other.getLjckzsl())) && (this.getLjrkzsl() == null ? other.getLjrkzsl() == null : this.getLjrkzsl().equals(other.getLjrkzsl())) && (this.getDr() == null ? other.getDr() == null : this.getDr().equals(other.getDr())) && (this.getTs() == null ? other.getTs() == null : this.getTs().equals(other.getTs())) && (this.getWmsFlag() == null ? other.getWmsFlag() == null : this.getWmsFlag().equals(other.getWmsFlag())) && (this.getYingzsl() == null ? other.getYingzsl() == null : this.getYingzsl().equals(other.getYingzsl())) && (this.getYingzzsl() == null ? other.getYingzzsl() == null : this.getYingzzsl().equals(other.getYingzzsl())) && (this.getBdr() == null ? other.getBdr() == null : this.getBdr().equals(other.getBdr())) && (this.getBts() == null ? other.getBts() == null : this.getBts().equals(other.getBts()));
}
@Override
@@ -411,6 +377,10 @@
result = prime * result + ((getDr() == null) ? 0 : getDr().hashCode());
result = prime * result + ((getTs() == null) ? 0 : getTs().hashCode());
result = prime * result + ((getWmsFlag() == null) ? 0 : getWmsFlag().hashCode());
+ result = prime * result + ((getYingzsl() == null) ? 0 : getYingzsl().hashCode());
+ result = prime * result + ((getYingzzsl() == null) ? 0 : getYingzzsl().hashCode());
+ result = prime * result + ((getBdr() == null) ? 0 : getBdr().hashCode());
+ result = prime * result + ((getBts() == null) ? 0 : getBts().hashCode());
return result;
}
@@ -474,6 +444,10 @@
sb.append(", dr=").append(dr);
sb.append(", ts=").append(ts);
sb.append(", wmsFlag=").append(wmsFlag);
+ sb.append(", yingzsl=").append(yingzsl);
+ sb.append(", yingzzsl=").append(yingzzsl);
+ sb.append(", bdr = ").append(bdr);
+ sb.append(", bts=").append(bts);
sb.append("]");
return sb.toString();
}
diff --git a/src/main/java/com/zy/nc/mapper/NccSaleXsfhmxWmsMapper.java b/src/main/java/com/zy/nc/mapper/NccSaleXsfhmxWmsMapper.java
index 2177d98..c82336c 100644
--- a/src/main/java/com/zy/nc/mapper/NccSaleXsfhmxWmsMapper.java
+++ b/src/main/java/com/zy/nc/mapper/NccSaleXsfhmxWmsMapper.java
@@ -1,15 +1,17 @@
package com.zy.nc.mapper;
-import com.zy.nc.entity.NccSaleXsfhmxWms;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.nc.entity.NccSaleXsfhmxWms;
+
+import java.util.List;
/**
-* @author ZY
-* @description 閽堝琛ㄣ�恘cc_sale_xsfhmx_wms銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2025-05-08 09:54:48
-* @Entity com.zy.nc.entity.NccSaleXsfhmxWms
-*/
+ * @author ZY
+ * @description 閽堝琛ㄣ�恘cc_sale_xsfhmx_wms銆戠殑鏁版嵁搴撴搷浣淢apper
+ * @createDate 2025-05-08 09:54:48
+ * @Entity com.zy.nc.entity.NccSaleXsfhmxWms
+ */
public interface NccSaleXsfhmxWmsMapper extends BaseMapper<NccSaleXsfhmxWms> {
-
+ List<String> selectXsfh();
}
diff --git a/src/main/java/com/zy/nc/mapper/NccScZkmxbWmsMapper.java b/src/main/java/com/zy/nc/mapper/NccScZkmxbWmsMapper.java
index 70f7198..a89a308 100644
--- a/src/main/java/com/zy/nc/mapper/NccScZkmxbWmsMapper.java
+++ b/src/main/java/com/zy/nc/mapper/NccScZkmxbWmsMapper.java
@@ -1,15 +1,17 @@
package com.zy.nc.mapper;
-import com.zy.nc.entity.NccScZkmxbWms;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.nc.entity.NccScZkmxbWms;
+
+import java.util.List;
/**
-* @author ZY
-* @description 閽堝琛ㄣ�恘cc_sc_zkmxb_wms銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2025-05-08 09:54:48
-* @Entity com.zy.nc.entity.NccScZkmxbWms
-*/
+ * @author ZY
+ * @description 閽堝琛ㄣ�恘cc_sc_zkmxb_wms銆戠殑鏁版嵁搴撴搷浣淢apper
+ * @createDate 2025-05-08 16:32:37
+ * @Entity com.zy.nc.entity.NccScZkmxbWms
+ */
public interface NccScZkmxbWmsMapper extends BaseMapper<NccScZkmxbWms> {
-
+ List<String> selectZk();
}
diff --git a/src/main/java/com/zy/nc/service/NccSaleXsfhmxWmsService.java b/src/main/java/com/zy/nc/service/NccSaleXsfhmxWmsService.java
index 0dd462b..b8ccf3d 100644
--- a/src/main/java/com/zy/nc/service/NccSaleXsfhmxWmsService.java
+++ b/src/main/java/com/zy/nc/service/NccSaleXsfhmxWmsService.java
@@ -3,6 +3,8 @@
import com.zy.nc.entity.NccSaleXsfhmxWms;
import com.baomidou.mybatisplus.service.IService;
+import java.util.List;
+
/**
* @author ZY
* @description 閽堝琛ㄣ�恘cc_sale_xsfhmx_wms銆戠殑鏁版嵁搴撴搷浣淪ervice
@@ -10,4 +12,6 @@
*/
public interface NccSaleXsfhmxWmsService extends IService<NccSaleXsfhmxWms> {
+ List<String> selectXsfh();
+
}
diff --git a/src/main/java/com/zy/nc/service/NccScZkmxbWmsService.java b/src/main/java/com/zy/nc/service/NccScZkmxbWmsService.java
index 7f567c9..964a605 100644
--- a/src/main/java/com/zy/nc/service/NccScZkmxbWmsService.java
+++ b/src/main/java/com/zy/nc/service/NccScZkmxbWmsService.java
@@ -3,11 +3,14 @@
import com.zy.nc.entity.NccScZkmxbWms;
import com.baomidou.mybatisplus.service.IService;
+import java.util.List;
+
/**
* @author ZY
* @description 閽堝琛ㄣ�恘cc_sc_zkmxb_wms銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2025-05-08 09:54:48
+* @createDate 2025-05-08 16:32:37
*/
public interface NccScZkmxbWmsService extends IService<NccScZkmxbWms> {
+ List<String> selectZk();
}
diff --git a/src/main/java/com/zy/nc/service/impl/NccSaleXsfhmxWmsServiceImpl.java b/src/main/java/com/zy/nc/service/impl/NccSaleXsfhmxWmsServiceImpl.java
index 24ad006..a680aa1 100644
--- a/src/main/java/com/zy/nc/service/impl/NccSaleXsfhmxWmsServiceImpl.java
+++ b/src/main/java/com/zy/nc/service/impl/NccSaleXsfhmxWmsServiceImpl.java
@@ -2,17 +2,23 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.nc.entity.NccSaleXsfhmxWms;
-import com.zy.nc.service.NccSaleXsfhmxWmsService;
import com.zy.nc.mapper.NccSaleXsfhmxWmsMapper;
+import com.zy.nc.service.NccSaleXsfhmxWmsService;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
-* @author ZY
-* @description 閽堝琛ㄣ�恘cc_sale_xsfhmx_wms銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2025-05-08 09:54:48
-*/
+ * @author ZY
+ * @description 閽堝琛ㄣ�恘cc_sale_xsfhmx_wms銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+ * @createDate 2025-05-08 09:54:48
+ */
@Service
public class NccSaleXsfhmxWmsServiceImpl extends ServiceImpl<NccSaleXsfhmxWmsMapper, NccSaleXsfhmxWms>
-implements NccSaleXsfhmxWmsService{
+ implements NccSaleXsfhmxWmsService {
+ @Override
+ public List<String> selectXsfh() {
+ return this.baseMapper.selectXsfh();
+ }
}
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 f6defe5..47b5819 100644
--- a/src/main/java/com/zy/nc/service/impl/NccScZkmxbWmsServiceImpl.java
+++ b/src/main/java/com/zy/nc/service/impl/NccScZkmxbWmsServiceImpl.java
@@ -6,13 +6,20 @@
import com.zy.nc.mapper.NccScZkmxbWmsMapper;
import org.springframework.stereotype.Service;
+import java.util.Collections;
+import java.util.List;
+
/**
* @author ZY
* @description 閽堝琛ㄣ�恘cc_sc_zkmxb_wms銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2025-05-08 09:54:48
+* @createDate 2025-05-08 16:32:37
*/
@Service
public class NccScZkmxbWmsServiceImpl extends ServiceImpl<NccScZkmxbWmsMapper, NccScZkmxbWms>
implements NccScZkmxbWmsService{
+ @Override
+ public List<String> selectZk() {
+ return Collections.emptyList();
+ }
}
diff --git a/src/main/java/com/zy/nc/task/BaseDataTask.java b/src/main/java/com/zy/nc/task/BaseDataTask.java
index e726c57..1115db1 100644
--- a/src/main/java/com/zy/nc/task/BaseDataTask.java
+++ b/src/main/java/com/zy/nc/task/BaseDataTask.java
@@ -1,7 +1,7 @@
package com.zy.nc.task;
import com.zy.asrs.task.core.ReturnT;
-import com.zy.nc.task.handler.PlanOrderHandler;
+import com.zy.nc.task.handler.BaseDataHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -12,19 +12,46 @@
public class BaseDataTask {
@Autowired
- private PlanOrderHandler planOrderHandler;
+ private BaseDataHandler baseDataHandler;
@Scheduled(cron = "0/3 * * * * ? ")
public void execute1() {
- ReturnT<String> returnT = planOrderHandler.start1();
+// ReturnT<String> returnT = baseDataHandler.start1();
+// if (!returnT.isSuccess()) {
+// log.error(returnT.getMsg());
+// }
+ }
+
+ /**
+ * 浜哄憳鏁版嵁鍚屾
+ */
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public void start8() {
+ ReturnT<String> returnT = baseDataHandler.start8();
if (!returnT.isSuccess()) {
log.error(returnT.getMsg());
}
}
+
+
+ /**
+ * 鐗╂枡鍒嗙被鏁版嵁鍚屾
+ */
@Scheduled(cron = "0/3 * * * * ? ")
- public void execute2() {
- ReturnT<String> returnT = planOrderHandler.start2();
+ public void start9() {
+ ReturnT<String> returnT = baseDataHandler.start9();
+ if (!returnT.isSuccess()) {
+ log.error(returnT.getMsg());
+ }
+ }
+
+ /**
+ * 鐗╂枡鍩虹鏁版嵁鍚屾
+ */
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public void execute13() {
+ ReturnT<String> returnT = baseDataHandler.start13();
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 6ec02e4..144aaf4 100644
--- a/src/main/java/com/zy/nc/task/PlanOrderTask.java
+++ b/src/main/java/com/zy/nc/task/PlanOrderTask.java
@@ -14,6 +14,12 @@
@Autowired
private PlanOrderHandler planOrderHandler;
+
+ /**
+ * 鍙戣揣
+ *
+ * @return
+ */
@Scheduled(cron = "0/3 * * * * ? ")
public void execute1() {
ReturnT<String> returnT = planOrderHandler.start1();
@@ -22,6 +28,11 @@
}
}
+ /**
+ * 杞簱
+ *
+ * @return
+ */
@Scheduled(cron = "0/3 * * * * ? ")
public void execute2() {
ReturnT<String> returnT = planOrderHandler.start2();
@@ -30,4 +41,12 @@
}
}
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public void execute3() {
+// ReturnT<String> returnT = planOrderHandler.start2();
+// if (!returnT.isSuccess()) {
+// log.error(returnT.getMsg());
+// }
+ }
+
}
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 370b5d3..fb441a6 100644
--- a/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
@@ -2,15 +2,27 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.Cools;
+import com.zy.asrs.entity.Tag;
+import com.zy.asrs.entity.param.MatSyncParam;
+import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.TagService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
-import com.zy.nc.entity.NccBdCustomerWms;
-import com.zy.nc.entity.NccSaleDbckmxb;
-import com.zy.nc.service.NccBdCustomerWmsService;
-import com.zy.nc.service.NccCgCgdhdWmsService;
+import com.zy.common.utils.NodeUtils;
+import com.zy.nc.entity.*;
+import com.zy.nc.service.*;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
@Service
@Slf4j
@@ -22,25 +34,231 @@
@Autowired
private NccCgCgdhdWmsService nccCgCgdhdWmsService;
+ @Autowired
+ private NccCkPddWmsService nccCkPddWmsService;
+
+
+ @Autowired
+ private NccJcBmWmsService nccJcBmWmsService;
+
+ @Autowired
+ private NccJcCkhwService nccJcCkhwService;
+
+ @Autowired
+ private NccJcCkWmsService nccJcCkWmsService;
+
+ @Autowired
+ private NccJcQilibcBarcodeflowWmsService nccJcQilibcBarcodeflowWmsService;
+
+ @Autowired
+ private NccJcRyWmsService nccJcRyWmsService;
+
+ @Autowired
+ private NccJcWlflWmsService nccJcWlflWmsService;
+
+ @Autowired
+ private NccOrgCorpWmsService nccOrgCorpWmsService;
+
+
+ @Autowired
+ private VGetBdMaterialService vGetBdMaterialService;
+
+ @Autowired
+ private OpenService openService;
+
+ @Autowired
+ private TagService tagService;
+
+ @Autowired
+ private UserService userService;
+
+ @Value("${NYNC.pageSize}")
+ private Integer pageSize;
+
/**
- *
- *
* @return
*/
public ReturnT<String> start1() {
- nccBdCustomerWmsService.selectList(new EntityWrapper<NccBdCustomerWms>().ne("wms_flag",1))
- log.info("shuju:{}", JSONObject.toJSON(nccSaleXsckmx));
+ Page<NccBdCustomerWms> page = new Page<>(1, pageSize);
+ Page<NccBdCustomerWms> wmsFlag = nccBdCustomerWmsService.selectPage(page, new EntityWrapper<NccBdCustomerWms>().ne("wms_flag", 1));
+ for (NccBdCustomerWms nccBdCustomerWms : wmsFlag.getRecords()) {
+ //TODO
+ log.info("NccBdCustomerWms鏁版嵁:{}", JSONObject.toJSON(nccBdCustomerWms));
+ }
return SUCCESS;
}
/**
- *
- *
* @return
*/
public ReturnT<String> start2() {
- NccSaleDbckmxb nccSaleDbckmxb = NccCgCgdhdWmsService.selectById("1001A1100000000H9KKJ");
- log.info("shuju:{}", JSONObject.toJSON(nccSaleDbckmxb));
+ Page<NccCgCgdhdWms> page = new Page<>(1, pageSize);
+ Page<NccCgCgdhdWms> wmsFlag = nccCgCgdhdWmsService.selectPage(page, new EntityWrapper<NccCgCgdhdWms>().ne("wms_flag", 1));
+ for (NccCgCgdhdWms nccCgCgdhdWms : wmsFlag.getRecords()) {
+ log.info("NccCgCgdhdWms鏁版嵁:{}", JSONObject.toJSON(nccCgCgdhdWms));
+ }
return SUCCESS;
}
+
+ public ReturnT<String> start3() {
+ Page<NccCkPddWms> page = new Page<>(1, pageSize);
+ Page<NccCkPddWms> wmsFlag = nccCkPddWmsService.selectPage(page, new EntityWrapper<NccCkPddWms>().ne("wms_flag", 1));
+ for (NccCkPddWms nccCkPddWms : wmsFlag.getRecords()) {
+ log.info("NccCkPddWms鏁版嵁:{}", JSONObject.toJSON(nccCkPddWms));
+ }
+ return SUCCESS;
+ }
+
+ public ReturnT<String> start4() {
+ Page<NccJcBmWms> page = new Page<>(1, pageSize);
+ Page<NccJcBmWms> wmsFlag = nccJcBmWmsService.selectPage(page, new EntityWrapper<NccJcBmWms>().ne("wms_flag", 1));
+ for (NccJcBmWms nccCkPddWms : wmsFlag.getRecords()) {
+ log.info("NccJcBmWms鏁版嵁:{}", JSONObject.toJSON(nccCkPddWms));
+ }
+ return SUCCESS;
+ }
+
+
+ public ReturnT<String> start5() {
+ Page<NccJcCkhw> page = new Page<>(1, pageSize);
+ Page<NccJcCkhw> wmsFlag = nccJcCkhwService.selectPage(page, new EntityWrapper<NccJcCkhw>().ne("wms_flag", 1));
+ for (NccJcCkhw nccJcCkhw : wmsFlag.getRecords()) {
+ log.info("NccJcCkhw鏁版嵁:{}", JSONObject.toJSON(nccJcCkhw));
+ }
+ return SUCCESS;
+ }
+
+ public ReturnT<String> start6() {
+ Page<NccJcCkWms> page = new Page<>(1, pageSize);
+ Page<NccJcCkWms> wmsFlag = nccJcCkWmsService.selectPage(page, new EntityWrapper<NccJcCkWms>().ne("wms_flag", 1));
+ for (NccJcCkWms nccJcCkWms : wmsFlag.getRecords()) {
+ log.info("NccJcCkWms鏁版嵁:{}", JSONObject.toJSON(nccJcCkWms));
+ }
+ return SUCCESS;
+ }
+
+ public ReturnT<String> start7() {
+ Page<NccJcQilibcBarcodeflowWms> page = new Page<>(1, pageSize);
+ Page<NccJcQilibcBarcodeflowWms> wmsFlag = nccJcQilibcBarcodeflowWmsService.selectPage(page, new EntityWrapper<NccJcQilibcBarcodeflowWms>().ne("wms_flag", 1));
+ for (NccJcQilibcBarcodeflowWms nccJcQilibcBarcodeflowWms : wmsFlag.getRecords()) {
+ log.info("NccJcQilibcBarcodeflowWms鏁版嵁:{}", JSONObject.toJSON(nccJcQilibcBarcodeflowWms));
+ }
+ return SUCCESS;
+ }
+
+ public ReturnT<String> start8() {
+ Page<NccJcRyWms> page = new Page<>(1, pageSize);
+ Page<NccJcRyWms> wmsFlag = nccJcRyWmsService.selectPage(page, new EntityWrapper<NccJcRyWms>().ne("wms_flag", 1).eq("sszzmc", "娴欐睙绂忚幈鏂版潗鏂欒偂浠芥湁闄愬叕鍙哥儫鍙板垎鍏徃"));
+ for (NccJcRyWms nccJcRyWms : wmsFlag.getRecords()) {
+ User user = userService.selectOne(new EntityWrapper<User>().eq("username", nccJcRyWms.getRybm()));
+ nccJcRyWms.setWmsFlag(1);
+ if (user == null) {
+ user = new User();
+ user.setUsername(nccJcRyWms.getRybm());
+ user.setStatus(1);
+ user.setCreateTime(new Date());
+ userService.insert(user);
+ }
+ log.info("NccJcRyWms鏁版嵁:{}", JSONObject.toJSON(nccJcRyWms));
+ }
+ nccJcRyWmsService.updateBatchById(wmsFlag.getRecords());
+ return SUCCESS;
+ }
+
+ public ReturnT<String> start9() {
+ Page<NccJcWlflWms> page = new Page<>(1, pageSize);
+ Page<NccJcWlflWms> wmsFlag = nccJcWlflWmsService.selectPage(page, new EntityWrapper<NccJcWlflWms>().ne("wms_flag", 1));
+ Tag top = tagService.getTop();
+ for (NccJcWlflWms nccJcWlflWms : wmsFlag.getRecords()) {
+ if (!Cools.isEmpty(nccJcWlflWms.getSjflbm())) {
+ Tag priTag = tagService.selectOne(new EntityWrapper<Tag>().eq("uuid", nccJcWlflWms.getSjflbm()));
+ if (priTag == null) {
+ continue;
+ } else {
+ Tag tag = new Tag();
+ tag.setUuid(nccJcWlflWms.getCode());
+ tag.setName(nccJcWlflWms.getName());
+ tag.setParentId(priTag.getId());
+ tag.setParentName(priTag.getName());
+ tag.setType(0);
+ tag.setLevel(priTag.getLevel() + 1);
+ tag.setStatus(1);
+ tag.setCreateTime(new Date());
+ tag.setPath(priTag.getPath());
+ NodeUtils nodeUtils = new NodeUtils();
+ nodeUtils.executePath(priTag.getId());
+ tag.setPath(nodeUtils.path.toString());
+ tag.setPathName(nodeUtils.pathName.toString());
+ tagService.insert(tag);
+ nccJcWlflWms.setWmsFlag(1);
+ nccJcWlflWmsService.updateById(nccJcWlflWms);
+ }
+ } else {
+ Tag tag = new Tag();
+ tag.setUuid(nccJcWlflWms.getCode());
+ tag.setName(nccJcWlflWms.getName());
+ tag.setStatus(1);
+ tag.setCreateTime(new Date());
+ tag.setType(0);
+ tag.setLevel(2);
+ tag.setParentId(top.getId());
+ tag.setParentName(top.getName());
+ tag.setPath(top.getPath());
+ NodeUtils nodeUtils = new NodeUtils();
+ nodeUtils.executePath(top.getId());
+ tag.setPath(nodeUtils.path.toString());
+ tag.setPathName(nodeUtils.pathName.toString());
+ tagService.insert(tag);
+ nccJcWlflWms.setWmsFlag(1);
+ nccJcWlflWmsService.updateById(nccJcWlflWms);
+ }
+ log.info("NccJcWlflWms鏁版嵁:{}", JSONObject.toJSON(nccJcWlflWms));
+ }
+ return SUCCESS;
+ }
+
+ public ReturnT<String> start10() {
+ Page<NccOrgCorpWms> page = new Page<>(1, pageSize);
+ Page<NccOrgCorpWms> wmsFlag = nccOrgCorpWmsService.selectPage(page, new EntityWrapper<NccOrgCorpWms>().ne("wms_flag", 1));
+ for (NccOrgCorpWms nccOrgCorpWms : wmsFlag.getRecords()) {
+
+ log.info("NccOrgCorpWms鏁版嵁:{}", JSONObject.toJSON(nccOrgCorpWms));
+ }
+ return SUCCESS;
+ }
+
+
+ public ReturnT<String> start13() {
+ Page<VGetBdMaterial> page = new Page<>(1, pageSize);
+ Page<VGetBdMaterial> wmsFlag = vGetBdMaterialService.selectPage(page, new EntityWrapper<VGetBdMaterial>().ne("wms_flag", 1));
+ MatSyncParam param = new MatSyncParam();
+ List<MatSyncParam.MatParam> matDetails = new ArrayList<>();
+ MatSyncParam.MatParam matParam;
+ for (VGetBdMaterial vGetBdMaterial : wmsFlag.getRecords()) {
+ Tag priTag = tagService.selectOne(new EntityWrapper<Tag>().eq("uuid", vGetBdMaterial.get瀛樿揣鍒嗙被缂栫爜()));
+ if (priTag == null) {
+ continue;
+ }
+ matParam = new MatSyncParam.MatParam();
+ matParam.setMatnr(vGetBdMaterial.get鐗╂枡缂栫爜());
+ matParam.setMaktx(vGetBdMaterial.get鐗╂枡鍚嶇О());
+ matParam.setSpecs(vGetBdMaterial.get瑙勬牸());
+ matParam.setModel(vGetBdMaterial.get鍨嬪彿());
+ matParam.setUnit(vGetBdMaterial.get涓诲崟浣�());
+ matParam.setMemo(vGetBdMaterial.get澶囨敞());
+ matParam.setGroupCode(vGetBdMaterial.get瀛樿揣鍒嗙被缂栫爜());
+ matParam.setGroupName(vGetBdMaterial.get瀛樿揣鍒嗙被鍚嶇О());
+ matDetails.add(matParam);
+ }
+ if (!matDetails.isEmpty()) {
+ param.setMatDetails(matDetails);
+ openService.syncMat(param);
+ for (VGetBdMaterial vGetBdMaterial : wmsFlag.getRecords()) {
+ vGetBdMaterial.setWmsFlag(1);
+ }
+ vGetBdMaterialService.updateBatchById(wmsFlag.getRecords());
+ }
+ return SUCCESS;
+ }
+
}
diff --git a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
index de0c5a5..3f2c0c3 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -1,25 +1,35 @@
package com.zy.nc.task.handler;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.entity.param.OpenOrderPakinParam;
+import com.zy.asrs.service.OpenService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
-import com.zy.nc.entity.NccSaleDbckmxb;
-import com.zy.nc.entity.NccSaleXsckmx;
-import com.zy.nc.mapper.NccSaleDbckmxbMapper;
-import com.zy.nc.mapper.NccSaleXsckmxMapper;
+import com.zy.common.model.DetlDto;
+import com.zy.nc.entity.NccSaleXsfhmxWms;
+import com.zy.nc.entity.NccScZkmxbWms;
+import com.zy.nc.service.NccSaleXsfhmxWmsService;
+import com.zy.nc.service.NccScZkmxbWmsService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
@Service
@Slf4j
public class PlanOrderHandler extends AbstractHandler<String> {
@Autowired
- private NccSaleXsckmxMapper nccSaleXsckmxMapper;
+ private NccSaleXsfhmxWmsService nccSaleXsfhmxWmsService;
@Autowired
- private NccSaleDbckmxbMapper nccSaleDbckmxbMapper;
+ private NccScZkmxbWmsService nccScZkmxbWmsService;
+
+ @Autowired
+ private OpenService openService;
/**
* 鍙戣揣
@@ -27,19 +37,64 @@
* @return
*/
public ReturnT<String> start1() {
- NccSaleXsckmx nccSaleXsckmx = nccSaleXsckmxMapper.selectById("1001A1100000000H9KKJ");
- log.info("shuju:{}", JSONObject.toJSON(nccSaleXsckmx));
+ List<String> Ids = nccSaleXsfhmxWmsService.selectXsfh();
+ for (String id : Ids) {
+ List<NccSaleXsfhmxWms> wmsFlag = nccSaleXsfhmxWmsService.selectList(new EntityWrapper<NccSaleXsfhmxWms>().eq("cdeliveryid", id).ne("wms_flag", 1).eq("fstatusflag", 2));
+ OpenOrderPakinParam param = new OpenOrderPakinParam();
+ param.setOrderType("閿�鍞彂璐�");
+ DetlDto detlDto;
+ List<DetlDto> orderDetails = new ArrayList<>();
+ long i = 1;
+ for (NccSaleXsfhmxWms nccSaleXsfhmxWms : wmsFlag) {
+ if (nccSaleXsfhmxWms.getFstatusflag() == 2 && nccSaleXsfhmxWms.getBdr() == 0 && nccSaleXsfhmxWms.getHdr() == 0) {
+ detlDto = new DetlDto();
+ detlDto.setMatnr(nccSaleXsfhmxWms.getWlbm());
+ detlDto.setAnfme(nccSaleXsfhmxWms.getNastnum());
+ detlDto.setLineNumber(i);
+ nccSaleXsfhmxWms.setWmsFlag(1);
+ orderDetails.add(detlDto);
+ log.info("NccSaleXsfhmxWms鏁版嵁:{}", JSONObject.toJSON(nccSaleXsfhmxWms));
+ i++;
+ }
+ }
+ param.setOrderDetails(orderDetails);
+ openService.pakinOrderCreate(param);
+ nccSaleXsfhmxWmsService.updateBatchById(wmsFlag);
+ }
return SUCCESS;
}
/**
- * 璋冩嫧
+ * 杞簱
*
* @return
*/
public ReturnT<String> start2() {
- NccSaleDbckmxb nccSaleDbckmxb = nccSaleDbckmxbMapper.selectById("1001A1100000000H9KKJ");
- log.info("shuju:{}", JSONObject.toJSON(nccSaleDbckmxb));
+ List<String> strings = nccScZkmxbWmsService.selectZk();
+ for (String string : strings) {
+ OpenOrderPakinParam param = new OpenOrderPakinParam();
+ param.setOrderType("杞簱");
+ DetlDto detlDto;
+ List<DetlDto> orderDetails = new ArrayList<>();
+ long i = 1;
+ List<NccScZkmxbWms> wmsFlag = nccScZkmxbWmsService.selectList(new EntityWrapper<NccScZkmxbWms>().eq("cdeliveryid", string).ne("wms_flag", 1));
+ for (NccScZkmxbWms nccScZkmxbWms : wmsFlag) {
+ log.info("NccScZkmxbWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms));
+ if (nccScZkmxbWms.getDjzt() == 2 && nccScZkmxbWms.getBdr() == 0 && nccScZkmxbWms.getDr() == 0) {
+ detlDto = new DetlDto();
+ detlDto.setMatnr(nccScZkmxbWms.getWlbm());
+ detlDto.setAnfme(nccScZkmxbWms.getYingzzsl());
+ detlDto.setBatch(nccScZkmxbWms.getVbatchcode());
+ detlDto.setLineNumber(i);
+ nccScZkmxbWms.setWmsFlag(1);
+ orderDetails.add(detlDto);
+ i++;
+ }
+ }
+ param.setOrderDetails(orderDetails);
+ openService.pakinOrderCreate(param);
+ nccScZkmxbWmsService.updateBatchById(wmsFlag);
+ }
return SUCCESS;
}
}
diff --git a/src/main/java/com/zy/nc/util/ResultMessageUtil.java b/src/main/java/com/zy/nc/util/NcResultMessage.java
similarity index 95%
rename from src/main/java/com/zy/nc/util/ResultMessageUtil.java
rename to src/main/java/com/zy/nc/util/NcResultMessage.java
index 129123d..14868c3 100644
--- a/src/main/java/com/zy/nc/util/ResultMessageUtil.java
+++ b/src/main/java/com/zy/nc/util/NcResultMessage.java
@@ -1,6 +1,6 @@
package com.zy.nc.util;
-public class ResultMessageUtil {
+public class NcResultMessage {
private boolean success;
diff --git a/src/main/java/com/zy/nc/vo/SaleOutHeadVO.java b/src/main/java/com/zy/nc/vo/SaleOutHeadVO.java
index 2c3bbd2..c125446 100644
--- a/src/main/java/com/zy/nc/vo/SaleOutHeadVO.java
+++ b/src/main/java/com/zy/nc/vo/SaleOutHeadVO.java
@@ -6,7 +6,7 @@
public class SaleOutHeadVO {
// 蹇呭～瀛楁
- private String pkOrg; // 搴撳瓨缁勭粐鏈�鏂扮増鏈�
+ private String pk_org; // 搴撳瓨缁勭粐鏈�鏂扮増鏈�
private String cwarehouseid; // 浠撳簱
// 鍙�夊瓧娈�
@@ -55,9 +55,9 @@
private Double ntotalpiece; // 鎬讳欢鏁�
private Double ntotalvolume; // 鎬讳綋绉�
private Double ntotalweight; // 鎬婚噸閲�
- private String pkGroup; // 闆嗗洟
- private String pkMeasware; // 璁￠噺鍣ㄥ叿
- private String pkOrgV; // 搴撳瓨缁勭粐
+ private String pk_group; // 闆嗗洟
+ private String pk_measware; // 璁￠噺鍣ㄥ叿
+ private String pk_orgV; // 搴撳瓨缁勭粐
private String taudittime; // 绛惧瓧鏃ユ湡
private String trafficorgoid; // 鐗╂祦缁勭粐鏈�鏂扮増鏈�
private String trafficorgvid; // 鐗╂祦缁勭粐
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ac5dc43..c03187d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -46,7 +46,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: integrationasrs
+ subject: ytflwms
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
@@ -80,17 +80,18 @@
# 鐢ㄥ弸NC瀵规帴
NYNC:
ip:
- prot:
+ port:
+ pageSize: 500
#1.閿�鍞嚭搴撳崟鍙傜収鍙戣揣鍗曟柊澧�
- saveRefDelivery: http://${ip}:${port}/nccloud/api/ic/saleout/saveRefDelivery
+ saveRefDelivery: /nccloud/api/ic/saleout/saveRefDelivery
#2.鍏朵粬鍏ュ簱鍗曞弬鐓ц浆搴撴柊澧�
- saveRefWhsTrans: http://ip:port/nccloud/api/ic/generalin/saveRefWhsTrans
+ saveRefWhsTrans: /nccloud/api/ic/generalin/saveRefWhsTrans
#3.鏂板閲囪喘鍏ュ簱鍗�
- purchasein: http://ip:port/nccloud/api/ic/purchasein/save
+ purchasein: /nccloud/api/ic/purchasein/save
#4.1鏂板杞簱鍗�
- whstrans: http://ip:port/nccloud/api/ic/whstrans/save
+ whstrans: /nccloud/api/ic/whstrans/save
#4.2鍏朵粬鍑哄簱鍗曟柊澧�
- generalout: http://ip:port/nccloud/api/ic/generalout/save
+ generalout: /nccloud/api/ic/generalout/save
#4.3.鍏朵粬鍏ュ簱鍗曞弬鐓ц浆搴撴柊澧�
#saveRefWhsTrans: http://ip:port/nccloud/api/ic/generalin/saveRefWhsTrans
#5.1鏂板杞簱鍗�
diff --git a/src/main/resources/com/zy/nc/mapper/NccBdCustomerWmsMapper.xml b/src/main/resources/com/zy/nc/mapper/NccBdCustomerWmsMapper.xml
deleted file mode 100644
index 36d3186..0000000
--- a/src/main/resources/com/zy/nc/mapper/NccBdCustomerWmsMapper.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.nc.mapper.NccBdCustomerWmsMapper">
-
- <resultMap id="BaseResultMap" type="com.zy.nc.entity.NccBdCustomerWms">
- <id property="pkCustomer" column="PK_CUSTOMER" />
- <result property="code" column="CODE" />
- <result property="name" column="NAME" />
- <result property="shortname" column="SHORTNAME" />
- <result property="taxpayerid" column="TAXPAYERID" />
- <result property="khlx" column="KHLX" />
- <result property="tel1" column="TEL1" />
- <result property="legalbody" column="LEGALBODY" />
- <result property="nlimitmny" column="NLIMITMNY" />
- <result property="wmsFlag" column="wms_flag" />
- </resultMap>
-
- <sql id="Base_Column_List">
- PK_CUSTOMER,CODE,NAME,SHORTNAME,TAXPAYERID,KHLX,
- TEL1,LEGALBODY,NLIMITMNY,wms_flag
- </sql>
-</mapper>
diff --git a/src/main/resources/com/zy/nc/mapper/NccCgCgdhdWmsMapper.xml b/src/main/resources/com/zy/nc/mapper/NccCgCgdhdWmsMapper.xml
deleted file mode 100644
index fde8567..0000000
--- a/src/main/resources/com/zy/nc/mapper/NccCgCgdhdWmsMapper.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.nc.mapper.NccCgCgdhdWmsMapper">
-
- <resultMap id="BaseResultMap" type="com.zy.nc.entity.NccCgCgdhdWms">
- <id property="pkArriveorderB" column="PK_ARRIVEORDER_B" />
- <result property="pkArriveorder" column="PK_ARRIVEORDER" />
- <result property="kczz" column="KCZZ" />
- <result property="kczzbm" column="KCZZBM" />
- <result property="kczzmc" column="KCZZMC" />
- <result property="cgzz" column="CGZZ" />
- <result property="cgzzbm" column="CGZZBM" />
- <result property="cgzzmc" column="CGZZMC" />
- <result property="vbillcode" column="VBILLCODE" />
- <result property="dbilldate" column="DBILLDATE" />
- <result property="pkSupplier" column="PK_SUPPLIER" />
- <result property="gysbm" column="GYSBM" />
- <result property="gysmc" column="GYSMC" />
- <result property="ywlc" column="YWLC" />
- <result property="dhlxbm" column="DHLXBM" />
- <result property="ysfs" column="YSFS" />
- <result property="shrbm" column="SHRBM" />
- <result property="shrmc" column="SHRMC" />
- <result property="cgbm" column="CGBM" />
- <result property="cgmc" column="CGMC" />
- <result property="fbillstatus" column="FBILLSTATUS" />
- <result property="vmemo" column="VMEMO" />
- <result property="wlbm" column="WLBM" />
- <result property="wlmc" column="WLMC" />
- <result property="nnum" column="NNUM" />
- <result property="nastnum" column="NASTNUM" />
- <result property="ydzsl" column="YDZSL" />
- <result property="ydsl" column="YDSL" />
- <result property="hts" column="HTS" />
- <result property="bts" column="BTS" />
- <result property="wmsFlag" column="wms_flag" />
- </resultMap>
-
- <sql id="Base_Column_List">
- PK_ARRIVEORDER_B,PK_ARRIVEORDER,KCZZ,KCZZBM,KCZZMC,CGZZ,
- CGZZBM,CGZZMC,VBILLCODE,DBILLDATE,PK_SUPPLIER,
- GYSBM,GYSMC,YWLC,DHLXBM,YSFS,
- SHRBM,SHRMC,CGBM,CGMC,FBILLSTATUS,
- VMEMO,WLBM,WLMC,NNUM,NASTNUM,
- YDZSL,YDSL,HTS,BTS,wms_flag
- </sql>
-</mapper>
diff --git a/src/main/resources/com/zy/nc/mapper/NccCkPddWmsMapper.xml b/src/main/resources/com/zy/nc/mapper/NccCkPddWmsMapper.xml
deleted file mode 100644
index 190c5f2..0000000
--- a/src/main/resources/com/zy/nc/mapper/NccCkPddWmsMapper.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.nc.mapper.NccCkPddWmsMapper">
-
- <resultMap id="BaseResultMap" type="com.zy.nc.entity.NccCkPddWms">
- <id property="cspecialbid" column="CSPECIALBID" />
- <result property="cspecialhid" column="CSPECIALHID" />
- <result property="kczz" column="KCZZ" />
- <result property="kczzbm" column="KCZZBM" />
- <result property="kczzmc" column="KCZZMC" />
- <result property="vbillcode" column="VBILLCODE" />
- <result property="dbilldate" column="DBILLDATE" />
- <result property="dcountdate" column="DCOUNTDATE" />
- <result property="ckbm" column="CKBM" />
- <result property="ckmc" column="CKMC" />
- <result property="bmbm" column="BMBM" />
- <result property="bmmc" column="BMMC" />
- <result property="pdrbm" column="PDRBM" />
- <result property="pdrmc" column="PDRMC" />
- <result property="fbillflag" column="FBILLFLAG" />
- <result property="vnote" column="VNOTE" />
- <result property="wlbm" column="WLBM" />
- <result property="wlmc" column="WLMC" />
- <result property="vbatchcode" column="VBATCHCODE" />
- <result property="pkBatchcode" column="PK_BATCHCODE" />
- <result property="zmsl" column="ZMSL" />
- <result property="tmsl" column="TMSL" />
- <result property="zmzsl" column="ZMZSL" />
- <result property="pdsl" column="PDSL" />
- <result property="spzsl" column="SPZSL" />
- <result property="hwbm" column="HWBM" />
- <result property="hwmc" column="HWMC" />
- <result property="hts" column="HTS" />
- <result property="bts" column="BTS" />
- <result property="wmsFlag" column="wms_flag" />
- </resultMap>
-
- <sql id="Base_Column_List">
- CSPECIALBID,CSPECIALHID,KCZZ,KCZZBM,KCZZMC,VBILLCODE,
- DBILLDATE,DCOUNTDATE,CKBM,CKMC,BMBM,
- BMMC,PDRBM,PDRMC,FBILLFLAG,VNOTE,
- WLBM,WLMC,VBATCHCODE,PK_BATCHCODE,ZMSL,
- TMSL,ZMZSL,PDSL,SPZSL,HWBM,
- HWMC,HTS,BTS,wms_flag
- </sql>
-</mapper>
diff --git a/src/main/resources/com/zy/nc/mapper/NccJcBmWmsMapper.xml b/src/main/resources/com/zy/nc/mapper/NccJcBmWmsMapper.xml
deleted file mode 100644
index 58da22f..0000000
--- a/src/main/resources/com/zy/nc/mapper/NccJcBmWmsMapper.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.nc.mapper.NccJcBmWmsMapper">
-
- <resultMap id="BaseResultMap" type="com.zy.nc.entity.NccJcBmWms">
- <result property="pkDept" column="PK_DEPT" />
- <result property="bmbm" column="BMBM" />
- <result property="bmmc" column="BMMC" />
- <result property="bmjc" column="BMJC" />
- <result property="sjbm" column="SJBM" />
- <result property="ssywdy" column="SSYWDY" />
- <result property="ssywdybm" column="SSYWDYBM" />
- <result property="ssywdymc" column="SSYWDYMC" />
- <result property="sssyb" column="SSSYB" />
- <result property="qyzt" column="QYZT" />
- <result property="wmsFlag" column="wms_flag" />
- </resultMap>
-
- <sql id="Base_Column_List">
- PK_DEPT,BMBM,BMMC,BMJC,SJBM,SSYWDY,
- SSYWDYBM,SSYWDYMC,SSSYB,QYZT,wms_flag
- </sql>
-</mapper>
diff --git a/src/main/resources/com/zy/nc/mapper/NccJcCkWmsMapper.xml b/src/main/resources/com/zy/nc/mapper/NccJcCkWmsMapper.xml
deleted file mode 100644
index fb67032..0000000
--- a/src/main/resources/com/zy/nc/mapper/NccJcCkWmsMapper.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.nc.mapper.NccJcCkWmsMapper">
-
- <resultMap id="BaseResultMap" type="com.zy.nc.entity.NccJcCkWms">
- <id property="pkStordoc" column="PK_STORDOC" />
- <result property="code" column="CODE" />
- <result property="creationtime" column="CREATIONTIME" />
- <result property="creator" column="CREATOR" />
- <result property="csflag" column="CSFLAG" />
- <result property="dataoriginflag" column="DATAORIGINFLAG" />
- <result property="def1" column="DEF1" />
- <result property="def2" column="DEF2" />
- <result property="def3" column="DEF3" />
- <result property="def4" column="DEF4" />
- <result property="def5" column="DEF5" />
- <result property="dr" column="DR" />
- <result property="enablestate" column="ENABLESTATE" />
- <result property="gubflag" column="GUBFLAG" />
- <result property="isagentstore" column="ISAGENTSTORE" />
- <result property="isatpaffected" column="ISATPAFFECTED" />
- <result property="iscalculatedinvcost" column="ISCALCULATEDINVCOST" />
- <result property="iscommissionout" column="ISCOMMISSIONOUT" />
- <result property="isdirectstore" column="ISDIRECTSTORE" />
- <result property="iskptaxstore" column="ISKPTAXSTORE" />
- <result property="isobligate" column="ISOBLIGATE" />
- <result property="isretail" column="ISRETAIL" />
- <result property="isshopstore" column="ISSHOPSTORE" />
- <result property="isstoreontheway" column="ISSTOREONTHEWAY" />
- <result property="memo" column="MEMO" />
- <result property="modifiedtime" column="MODIFIEDTIME" />
- <result property="modifier" column="MODIFIER" />
- <result property="mrpflag" column="MRPFLAG" />
- <result property="name" column="NAME" />
- <result property="name2" column="NAME2" />
- <result property="name3" column="NAME3" />
- <result property="name4" column="NAME4" />
- <result property="name5" column="NAME5" />
- <result property="name6" column="NAME6" />
- <result property="operatesupplier" column="OPERATESUPPLIER" />
- <result property="phone" column="PHONE" />
- <result property="pkAddress" column="PK_ADDRESS" />
- <result property="pkGroup" column="PK_GROUP" />
- <result property="pkOrg" column="PK_ORG" />
- <result property="principalcode" column="PRINCIPALCODE" />
- <result property="profitcentre" column="PROFITCENTRE" />
- <result property="proflag" column="PROFLAG" />
- <result property="storaddr" column="STORADDR" />
- <result property="ts" column="TS" />
- <result property="wmsFlag" column="wms_flag" />
- </resultMap>
-
- <sql id="Base_Column_List">
- PK_STORDOC,CODE,CREATIONTIME,CREATOR,CSFLAG,DATAORIGINFLAG,
- DEF1,DEF2,DEF3,DEF4,DEF5,
- DR,ENABLESTATE,GUBFLAG,ISAGENTSTORE,ISATPAFFECTED,
- ISCALCULATEDINVCOST,ISCOMMISSIONOUT,ISDIRECTSTORE,ISKPTAXSTORE,ISOBLIGATE,
- ISRETAIL,ISSHOPSTORE,ISSTOREONTHEWAY,MEMO,MODIFIEDTIME,
- MODIFIER,MRPFLAG,NAME,NAME2,NAME3,
- NAME4,NAME5,NAME6,OPERATESUPPLIER,PHONE,
- PK_ADDRESS,PK_GROUP,PK_ORG,PRINCIPALCODE,PROFITCENTRE,
- PROFLAG,STORADDR,TS,wms_flag
- </sql>
-</mapper>
diff --git a/src/main/resources/com/zy/nc/mapper/NccJcCkhwMapper.xml b/src/main/resources/com/zy/nc/mapper/NccJcCkhwMapper.xml
deleted file mode 100644
index ebe0c9e..0000000
--- a/src/main/resources/com/zy/nc/mapper/NccJcCkhwMapper.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.nc.mapper.NccJcCkhwMapper">
-
- <resultMap id="BaseResultMap" type="com.zy.nc.entity.NccJcCkhw">
- <id property="pkRack" column="PK_RACK" />
- <result property="pkStordoc" column="PK_STORDOC" />
- <result property="ckbm" column="CKBM" />
- <result property="ckmc" column="CKMC" />
- <result property="hwbm" column="HWBM" />
- <result property="hwmc" column="HWMC" />
- <result property="wmsFlag" column="wms_flag" />
- </resultMap>
-
- <sql id="Base_Column_List">
- PK_RACK,PK_STORDOC,CKBM,CKMC,HWBM,HWMC,
- wms_flag
- </sql>
-</mapper>
diff --git a/src/main/resources/com/zy/nc/mapper/NccJcQilibcBarcodeflowWmsMapper.xml b/src/main/resources/com/zy/nc/mapper/NccJcQilibcBarcodeflowWmsMapper.xml
deleted file mode 100644
index fb79aaa..0000000
--- a/src/main/resources/com/zy/nc/mapper/NccJcQilibcBarcodeflowWmsMapper.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.nc.mapper.NccJcQilibcBarcodeflowWmsMapper">
-
- <resultMap id="BaseResultMap" type="com.zy.nc.entity.NccJcQilibcBarcodeflowWms">
- <id property="pkBarcode" column="PK_BARCODE" />
- <result property="ts" column="TS" />
- <result property="vbarcode" column="VBARCODE" />
- <result property="infla" column="INFLA" />
- <result property="asnnum" column="ASNNUM" />
- <result property="pkMaterial" column="PK_MATERIAL" />
- <result property="pkStordoc" column="PK_STORDOC" />
- <result property="memo" column="MEMO" />
- <result property="vbillno" column="VBILLNO" />
- <result property="nastnum" column="NASTNUM" />
- <result property="wmsFlag" column="wms_flag" />
- </resultMap>
-
- <sql id="Base_Column_List">
- PK_BARCODE,TS,VBARCODE,INFLA,ASNNUM,PK_MATERIAL,
- PK_STORDOC,MEMO,VBILLNO,NASTNUM,wms_flag
- </sql>
-</mapper>
diff --git a/src/main/resources/com/zy/nc/mapper/NccJcRyWmsMapper.xml b/src/main/resources/com/zy/nc/mapper/NccJcRyWmsMapper.xml
deleted file mode 100644
index 0432632..0000000
--- a/src/main/resources/com/zy/nc/mapper/NccJcRyWmsMapper.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.nc.mapper.NccJcRyWmsMapper">
-
- <resultMap id="BaseResultMap" type="com.zy.nc.entity.NccJcRyWms">
- <result property="pkPsndoc" column="PK_PSNDOC" />
- <result property="qyzt" column="QYZT" />
- <result property="rybm" column="RYBM" />
- <result property="rymc" column="RYMC" />
- <result property="pkOrg" column="PK_ORG" />
- <result property="sszzbm" column="SSZZBM" />
- <result property="sszzmc" column="SSZZMC" />
- <result property="pkDept" column="PK_DEPT" />
- <result property="ssbmbm" column="SSBMBM" />
- <result property="ssbmmc" column="SSBMMC" />
- <result property="sssyb" column="SSSYB" />
- <result property="wmsFlag" column="wms_flag" />
- </resultMap>
-
- <sql id="Base_Column_List">
- PK_PSNDOC,QYZT,RYBM,RYMC,PK_ORG,SSZZBM,
- SSZZMC,PK_DEPT,SSBMBM,SSBMMC,SSSYB,
- wms_flag
- </sql>
-</mapper>
diff --git a/src/main/resources/com/zy/nc/mapper/NccJcWlflWmsMapper.xml b/src/main/resources/com/zy/nc/mapper/NccJcWlflWmsMapper.xml
deleted file mode 100644
index 762f423..0000000
--- a/src/main/resources/com/zy/nc/mapper/NccJcWlflWmsMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.nc.mapper.NccJcWlflWmsMapper">
-
- <resultMap id="BaseResultMap" type="com.zy.nc.entity.NccJcWlflWms">
- <id property="pkMarbasclass" column="PK_MARBASCLASS" />
- <result property="code" column="CODE" />
- <result property="name" column="NAME" />
- <result property="sjflbm" column="SJFLBM" />
- <result property="sjflmc" column="SJFLMC" />
- <result property="wljbfl" column="WLJBFL" />
- <result property="code1" column="CODE1" />
- <result property="wmsFlag" column="wms_flag" />
- </resultMap>
-
- <sql id="Base_Column_List">
- PK_MARBASCLASS,CODE,NAME,SJFLBM,SJFLMC,WLJBFL,
- CODE1,wms_flag
- </sql>
-</mapper>
diff --git a/src/main/resources/com/zy/nc/mapper/NccOrgCorpWmsMapper.xml b/src/main/resources/com/zy/nc/mapper/NccOrgCorpWmsMapper.xml
deleted file mode 100644
index 9a68217..0000000
--- a/src/main/resources/com/zy/nc/mapper/NccOrgCorpWmsMapper.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.nc.mapper.NccOrgCorpWmsMapper">
-
- <resultMap id="BaseResultMap" type="com.zy.nc.entity.NccOrgCorpWms">
- <result property="code" column="CODE" />
- <result property="name" column="NAME" />
- <result property="shortname" column="SHORTNAME" />
- <result property="wmsFlag" column="wms_flag" />
- </resultMap>
-
- <sql id="Base_Column_List">
- CODE,NAME,SHORTNAME,wms_flag
- </sql>
-</mapper>
diff --git a/src/main/resources/com/zy/nc/mapper/NccSaleXsfhmxWmsMapper.xml b/src/main/resources/com/zy/nc/mapper/NccSaleXsfhmxWmsMapper.xml
deleted file mode 100644
index bd3657d..0000000
--- a/src/main/resources/com/zy/nc/mapper/NccSaleXsfhmxWmsMapper.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.nc.mapper.NccSaleXsfhmxWmsMapper">
-
- <resultMap id="BaseResultMap" type="com.zy.nc.entity.NccSaleXsfhmxWms">
- <id property="cdeliverybid" column="CDELIVERYBID" />
- <result property="cdeliveryid" column="CDELIVERYID" />
- <result property="vbillcode" column="VBILLCODE" />
- <result property="csaleorgid" column="CSALEORGID" />
- <result property="cszzbm" column="CSZZBM" />
- <result property="xxzzmc" column="XXZZMC" />
- <result property="hdbilldate" column="HDBILLDATE" />
- <result property="cdeptvid" column="CDEPTVID" />
- <result property="bmbm" column="BMBM" />
- <result property="bmmc" column="BMMC" />
- <result property="def5" column="DEF5" />
- <result property="sssyb" column="SSSYB" />
- <result property="fstatusflag" column="FSTATUSFLAG" />
- <result property="taudittime" column="TAUDITTIME" />
- <result property="hdr" column="HDR" />
- <result property="fbcdeliveryid" column="FBCDELIVERYID" />
- <result property="dbilldate" column="DBILLDATE" />
- <result property="cordercustid" column="CORDERCUSTID" />
- <result property="khbm" column="KHBM" />
- <result property="khmc" column="KHMC" />
- <result property="khjc" column="KHJC" />
- <result property="ywy" column="YWY" />
- <result property="cmaterialid" column="CMATERIALID" />
- <result property="wlbm" column="WLBM" />
- <result property="wlmc" column="WLMC" />
- <result property="wlgg" column="WLGG" />
- <result property="wlxh" column="WLXH" />
- <result property="wlflid" column="WLFLID" />
- <result property="wlflbm" column="WLFLBM" />
- <result property="wlflmc" column="WLFLMC" />
- <result property="castunitid" column="CASTUNITID" />
- <result property="dw" column="DW" />
- <result property="nastnum" column="NASTNUM" />
- <result property="cunitid" column="CUNITID" />
- <result property="zdw" column="ZDW" />
- <result property="nnum" column="NNUM" />
- <result property="npiece" column="NPIECE" />
- <result property="blargessflag" column="BLARGESSFLAG" />
- <result property="corigcurrencyid" column="CORIGCURRENCYID" />
- <result property="yb" column="YB" />
- <result property="nexchangerate" column="NEXCHANGERATE" />
- <result property="ccurrencyid" column="CCURRENCYID" />
- <result property="ctaxcodeid" column="CTAXCODEID" />
- <result property="ntaxrate" column="NTAXRATE" />
- <result property="norigtaxprice" column="NORIGTAXPRICE" />
- <result property="norigprice" column="NORIGPRICE" />
- <result property="norigmny" column="NORIGMNY" />
- <result property="norigtaxmny" column="NORIGTAXMNY" />
- <result property="ntaxprice" column="NTAXPRICE" />
- <result property="nprice" column="NPRICE" />
- <result property="nqttaxprice" column="NQTTAXPRICE" />
- <result property="nqtprice" column="NQTPRICE" />
- <result property="ntax" column="NTAX" />
- <result property="nmny" column="NMNY" />
- <result property="ntaxmny" column="NTAXMNY" />
- <result property="vfirstcode" column="VFIRSTCODE" />
- <result property="cfirstid" column="CFIRSTID" />
- <result property="cfirstbid" column="CFIRSTBID" />
- <result property="vsrccode" column="VSRCCODE" />
- <result property="csrcid" column="CSRCID" />
- <result property="csrcbid" column="CSRCBID" />
- <result property="dsenddate" column="DSENDDATE" />
- <result property="ntotaloutnum" column="NTOTALOUTNUM" />
- <result property="boutendflag" column="BOUTENDFLAG" />
- <result property="ntotalnotoutnum" column="NTOTALNOTOUTNUM" />
- <result property="bdr" column="BDR" />
- <result property="ts" column="TS" />
- <result property="hts" column="HTS" />
- <result property="shsf" column="SHSF" />
- <result property="gssf" column="GSSF" />
- <result property="kczzbm" column="KCZZBM" />
- <result property="kczzmc" column="KCZZMC" />
- <result property="vnote" column="VNOTE" />
- <result property="wmsFlag" column="wms_flag" />
- </resultMap>
-
- <sql id="Base_Column_List">
- CDELIVERYBID,CDELIVERYID,VBILLCODE,CSALEORGID,CSZZBM,XXZZMC,
- HDBILLDATE,CDEPTVID,BMBM,BMMC,DEF5,
- SSSYB,FSTATUSFLAG,TAUDITTIME,HDR,FBCDELIVERYID,
- DBILLDATE,CORDERCUSTID,KHBM,KHMC,KHJC,
- YWY,CMATERIALID,WLBM,WLMC,WLGG,
- WLXH,WLFLID,WLFLBM,WLFLMC,CASTUNITID,
- DW,NASTNUM,CUNITID,ZDW,NNUM,
- NPIECE,BLARGESSFLAG,CORIGCURRENCYID,YB,NEXCHANGERATE,
- CCURRENCYID,CTAXCODEID,NTAXRATE,NORIGTAXPRICE,NORIGPRICE,
- NORIGMNY,NORIGTAXMNY,NTAXPRICE,NPRICE,NQTTAXPRICE,
- NQTPRICE,NTAX,NMNY,NTAXMNY,VFIRSTCODE,
- CFIRSTID,CFIRSTBID,VSRCCODE,CSRCID,CSRCBID,
- DSENDDATE,NTOTALOUTNUM,BOUTENDFLAG,NTOTALNOTOUTNUM,BDR,
- TS,HTS,SHSF,GSSF,KCZZBM,
- KCZZMC,VNOTE,wms_flag
- </sql>
-</mapper>
diff --git a/src/main/resources/com/zy/nc/mapper/NccScZkmxbWmsMapper.xml b/src/main/resources/com/zy/nc/mapper/NccScZkmxbWmsMapper.xml
deleted file mode 100644
index 047f279..0000000
--- a/src/main/resources/com/zy/nc/mapper/NccScZkmxbWmsMapper.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.nc.mapper.NccScZkmxbWmsMapper">
-
- <resultMap id="BaseResultMap" type="com.zy.nc.entity.NccScZkmxbWms">
- <id property="cspecialbid" column="CSPECIALBID" />
- <result property="vbillcode" column="VBILLCODE" />
- <result property="dmakedate" column="DMAKEDATE" />
- <result property="scdmakedate" column="SCDMAKEDATE" />
- <result property="dbilldate" column="DBILLDATE" />
- <result property="taudittime" column="TAUDITTIME" />
- <result property="zzbm" column="ZZBM" />
- <result property="zzmc" column="ZZMC" />
- <result property="ckzzbm" column="CKZZBM" />
- <result property="ckzzmc" column="CKZZMC" />
- <result property="ckssbcode" column="CKSSBCODE" />
- <result property="cksssyb" column="CKSSSYB" />
- <result property="ckckbm" column="CKCKBM" />
- <result property="ckckmc" column="CKCKMC" />
- <result property="ckbmbm" column="CKBMBM" />
- <result property="ckbmmc" column="CKBMMC" />
- <result property="rkzzbm" column="RKZZBM" />
- <result property="rkzzmc" column="RKZZMC" />
- <result property="rkssbcode" column="RKSSBCODE" />
- <result property="rksssyb" column="RKSSSYB" />
- <result property="rkckbm" column="RKCKBM" />
- <result property="rkckmc" column="RKCKMC" />
- <result property="rkbmbm" column="RKBMBM" />
- <result property="rkbmmc" column="RKBMMC" />
- <result property="djzt" column="DJZT" />
- <result property="zklx" column="ZKLX" />
- <result property="wlbm" column="WLBM" />
- <result property="wlmc" column="WLMC" />
- <result property="wlgg" column="WLGG" />
- <result property="wlxh" column="WLXH" />
- <result property="wljc" column="WLJC" />
- <result property="jbflbm" column="JBFLBM" />
- <result property="jbflmc" column="JBFLMC" />
- <result property="sjflbm" column="SJFLBM" />
- <result property="sjflmc" column="SJFLMC" />
- <result property="zsjflbm" column="ZSJFLBM" />
- <result property="zsjflmc" column="ZSJFLMC" />
- <result property="zdw" column="ZDW" />
- <result property="fdw" column="FDW" />
- <result property="kczt" column="KCZT" />
- <result property="vbatchcode" column="VBATCHCODE" />
- <result property="vdef1" column="VDEF1" />
- <result property="vdef2" column="VDEF2" />
- <result property="vdef3" column="VDEF3" />
- <result property="khbm" column="KHBM" />
- <result property="khmc" column="KHMC" />
- <result property="khjc" column="KHJC" />
- <result property="yzzsl" column="YZZSL" />
- <result property="yzfsl" column="YZFSL" />
- <result property="ljckzsl" column="LJCKZSL" />
- <result property="ljrkzsl" column="LJRKZSL" />
- <result property="dr" column="DR" />
- <result property="ts" column="TS" />
- <result property="wmsFlag" column="wms_flag" />
- </resultMap>
-
- <sql id="Base_Column_List">
- CSPECIALBID,VBILLCODE,DMAKEDATE,SCDMAKEDATE,DBILLDATE,TAUDITTIME,
- ZZBM,ZZMC,CKZZBM,CKZZMC,CKSSBCODE,
- CKSSSYB,CKCKBM,CKCKMC,CKBMBM,CKBMMC,
- RKZZBM,RKZZMC,RKSSBCODE,RKSSSYB,RKCKBM,
- RKCKMC,RKBMBM,RKBMMC,DJZT,ZKLX,
- WLBM,WLMC,WLGG,WLXH,WLJC,
- JBFLBM,JBFLMC,SJFLBM,SJFLMC,ZSJFLBM,
- ZSJFLMC,ZDW,FDW,KCZT,VBATCHCODE,
- VDEF1,VDEF2,VDEF3,KHBM,KHMC,
- KHJC,YZZSL,YZFSL,LJCKZSL,LJRKZSL,
- DR,TS,wms_flag
- </sql>
-</mapper>
diff --git a/src/main/resources/com/zy/nc/mapper/VGetBdMaterialMapper.xml b/src/main/resources/com/zy/nc/mapper/VGetBdMaterialMapper.xml
deleted file mode 100644
index bdb15a8..0000000
--- a/src/main/resources/com/zy/nc/mapper/VGetBdMaterialMapper.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.nc.mapper.VGetBdMaterialMapper">
-
- <resultMap id="BaseResultMap" type="com.zy.nc.entity.VGetBdMaterial">
- <id property="pkMaterial" column="PK_MATERIAL" />
- <result property="鐗╂枡缂栫爜" column="鐗╂枡缂栫爜" />
- <result property="鐗╂枡鍚嶇О" column="鐗╂枡鍚嶇О" />
- <result property="瑙勬牸" column="瑙勬牸" />
- <result property="鏍哥畻绯绘暟" column="鏍哥畻绯绘暟" />
- <result property="鐑熷彴鏍哥畻绯绘暟" column="鐑熷彴鏍哥畻绯绘暟" />
- <result property="鍨嬪彿" column="鍨嬪彿" />
- <result property="鍔╄鐮�" column="鍔╄鐮�" />
- <result property="鐗╂枡绠�绉皍8鏃у搧鍚�" column="鐗╂枡绠�绉癠8鏃у搧鍚�" />
- <result property="澶囨敞" column="澶囨敞" />
- <result property="鑻辨枃鐗╂枡鍚嶇О" column="鑻辨枃鐗╂枡鍚嶇О" />
- <result property="ts" column="TS" />
- <result property="瀛樿揣鍒嗙被缂栫爜" column="瀛樿揣鍒嗙被缂栫爜" />
- <result property="瀛樿揣鍒嗙被鍚嶇О" column="瀛樿揣鍒嗙被鍚嶇О" />
- <result property="涓诲崟浣�" column="涓诲崟浣�" />
- <result property="涓讳腑鏂囧崟浣�" column="涓讳腑鏂囧崟浣�" />
- <result property="涓讳腑鏂囧崟浣�2" column="涓讳腑鏂囧崟浣�2" />
- <result property="杈呭崟浣�" column="杈呭崟浣�" />
- <result property="杈呬腑鏂囧崟浣�" column="杈呬腑鏂囧崟浣�" />
- <result property="涓昏緟鎹㈢畻姣�" column="涓昏緟鎹㈢畻姣�" />
- <result property="鍥哄畾鎹㈢畻" column="鍥哄畾鎹㈢畻" />
- <result property="缁撳瓨" column="缁撳瓨" />
- <result property="鐢熶骇榛樿鍗曚綅" column="鐢熶骇榛樿鍗曚綅" />
- <result property="瀹藉箙" column="瀹藉箙" />
- <result property="鏍囧噯杞﹂��" column="鏍囧噯杞﹂��" />
- <result property="鎴愭湰鍒嗙被" column="鎴愭湰鍒嗙被" />
- <result property="搴撳瓨鐘舵��" column="搴撳瓨鐘舵��" />
- <result property="鍗曚綅閲嶉噺" column="鍗曚綅閲嶉噺" />
- <result property="鍚敤鐘舵��" column="鍚敤鐘舵��" />
- <result property="鏄惁澶栬锤" column="鏄惁澶栬锤" />
- <result property="娴峰叧缂栫爜" column="娴峰叧缂栫爜" />
- <result property="娴峰叧鍚嶇О" column="娴峰叧鍚嶇О" />
- <result property="鎶ュ叧鑻辨枃鍚�" column="鎶ュ叧鑻辨枃鍚�" />
- <result property="鍙戠エ鍚嶇О" column="鍙戠エ鍚嶇О" />
- <result property="鍒涘缓鏃堕棿" column="鍒涘缓鏃堕棿" />
- <result property="鏈�鍚庝慨鏀规椂闂�" column="鏈�鍚庝慨鏀规椂闂�" />
- <result property="defcode" column="DEFCODE" />
- <result property="defname" column="DEFNAME" />
- <result property="zsjflbm" column="ZSJFLBM" />
- <result property="zsjflmc" column="ZSJFLMC" />
- <result property="sjflbm" column="SJFLBM" />
- <result property="sjflmc" column="SJFLMC" />
- <result property="wmsFlag" column="wms_flag" />
- </resultMap>
-
- <sql id="Base_Column_List">
- PK_MATERIAL,鐗╂枡缂栫爜,鐗╂枡鍚嶇О,瑙勬牸,鏍哥畻绯绘暟,鐑熷彴鏍哥畻绯绘暟,
- 鍨嬪彿,鍔╄鐮�,鐗╂枡绠�绉癠8鏃у搧鍚�,澶囨敞,鑻辨枃鐗╂枡鍚嶇О,
- TS,瀛樿揣鍒嗙被缂栫爜,瀛樿揣鍒嗙被鍚嶇О,涓诲崟浣�,涓讳腑鏂囧崟浣�,
- 涓讳腑鏂囧崟浣�2,杈呭崟浣�,杈呬腑鏂囧崟浣�,涓昏緟鎹㈢畻姣�,鍥哄畾鎹㈢畻,
- 缁撳瓨,鐢熶骇榛樿鍗曚綅,瀹藉箙,鏍囧噯杞﹂��,鎴愭湰鍒嗙被,
- 搴撳瓨鐘舵��,鍗曚綅閲嶉噺,鍚敤鐘舵��,鏄惁澶栬锤,娴峰叧缂栫爜,
- 娴峰叧鍚嶇О,鎶ュ叧鑻辨枃鍚�,鍙戠エ鍚嶇О,鍒涘缓鏃堕棿,鏈�鍚庝慨鏀规椂闂�,
- DEFCODE,DEFNAME,ZSJFLBM,ZSJFLMC,SJFLBM,
- SJFLMC,wms_flag
- </sql>
-</mapper>
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index 22364dc..9b8be17 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
diff --git a/src/main/resources/mapper/nc/NccBdCustomerWmsMapper.xml b/src/main/resources/mapper/nc/NccBdCustomerWmsMapper.xml
index bb0540d..36d3186 100644
--- a/src/main/resources/mapper/nc/NccBdCustomerWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccBdCustomerWmsMapper.xml
@@ -14,10 +14,11 @@
<result property="tel1" column="TEL1" />
<result property="legalbody" column="LEGALBODY" />
<result property="nlimitmny" column="NLIMITMNY" />
+ <result property="wmsFlag" column="wms_flag" />
</resultMap>
<sql id="Base_Column_List">
PK_CUSTOMER,CODE,NAME,SHORTNAME,TAXPAYERID,KHLX,
- TEL1,LEGALBODY,NLIMITMNY
+ TEL1,LEGALBODY,NLIMITMNY,wms_flag
</sql>
</mapper>
diff --git a/src/main/resources/mapper/nc/NccCgCgdhdWmsMapper.xml b/src/main/resources/mapper/nc/NccCgCgdhdWmsMapper.xml
index 695641d..fde8567 100644
--- a/src/main/resources/mapper/nc/NccCgCgdhdWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccCgCgdhdWmsMapper.xml
@@ -35,6 +35,7 @@
<result property="ydsl" column="YDSL" />
<result property="hts" column="HTS" />
<result property="bts" column="BTS" />
+ <result property="wmsFlag" column="wms_flag" />
</resultMap>
<sql id="Base_Column_List">
@@ -43,6 +44,6 @@
GYSBM,GYSMC,YWLC,DHLXBM,YSFS,
SHRBM,SHRMC,CGBM,CGMC,FBILLSTATUS,
VMEMO,WLBM,WLMC,NNUM,NASTNUM,
- YDZSL,YDSL,HTS,BTS
+ YDZSL,YDSL,HTS,BTS,wms_flag
</sql>
</mapper>
diff --git a/src/main/resources/mapper/nc/NccCkPddWmsMapper.xml b/src/main/resources/mapper/nc/NccCkPddWmsMapper.xml
index 4fb22d4..190c5f2 100644
--- a/src/main/resources/mapper/nc/NccCkPddWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccCkPddWmsMapper.xml
@@ -34,6 +34,7 @@
<result property="hwmc" column="HWMC" />
<result property="hts" column="HTS" />
<result property="bts" column="BTS" />
+ <result property="wmsFlag" column="wms_flag" />
</resultMap>
<sql id="Base_Column_List">
@@ -42,6 +43,6 @@
BMMC,PDRBM,PDRMC,FBILLFLAG,VNOTE,
WLBM,WLMC,VBATCHCODE,PK_BATCHCODE,ZMSL,
TMSL,ZMZSL,PDSL,SPZSL,HWBM,
- HWMC,HTS,BTS
+ HWMC,HTS,BTS,wms_flag
</sql>
</mapper>
diff --git a/src/main/resources/mapper/nc/NccJcBmWmsMapper.xml b/src/main/resources/mapper/nc/NccJcBmWmsMapper.xml
index 7d9c3cd..58da22f 100644
--- a/src/main/resources/mapper/nc/NccJcBmWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccJcBmWmsMapper.xml
@@ -15,10 +15,11 @@
<result property="ssywdymc" column="SSYWDYMC" />
<result property="sssyb" column="SSSYB" />
<result property="qyzt" column="QYZT" />
+ <result property="wmsFlag" column="wms_flag" />
</resultMap>
<sql id="Base_Column_List">
PK_DEPT,BMBM,BMMC,BMJC,SJBM,SSYWDY,
- SSYWDYBM,SSYWDYMC,SSSYB,QYZT
+ SSYWDYBM,SSYWDYMC,SSSYB,QYZT,wms_flag
</sql>
</mapper>
diff --git a/src/main/resources/mapper/nc/NccJcCkWmsMapper.xml b/src/main/resources/mapper/nc/NccJcCkWmsMapper.xml
index e33cf16..fb67032 100644
--- a/src/main/resources/mapper/nc/NccJcCkWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccJcCkWmsMapper.xml
@@ -49,6 +49,7 @@
<result property="proflag" column="PROFLAG" />
<result property="storaddr" column="STORADDR" />
<result property="ts" column="TS" />
+ <result property="wmsFlag" column="wms_flag" />
</resultMap>
<sql id="Base_Column_List">
@@ -60,6 +61,6 @@
MODIFIER,MRPFLAG,NAME,NAME2,NAME3,
NAME4,NAME5,NAME6,OPERATESUPPLIER,PHONE,
PK_ADDRESS,PK_GROUP,PK_ORG,PRINCIPALCODE,PROFITCENTRE,
- PROFLAG,STORADDR,TS
+ PROFLAG,STORADDR,TS,wms_flag
</sql>
</mapper>
diff --git a/src/main/resources/mapper/nc/NccJcCkhwMapper.xml b/src/main/resources/mapper/nc/NccJcCkhwMapper.xml
index 5df37e4..ebe0c9e 100644
--- a/src/main/resources/mapper/nc/NccJcCkhwMapper.xml
+++ b/src/main/resources/mapper/nc/NccJcCkhwMapper.xml
@@ -11,9 +11,11 @@
<result property="ckmc" column="CKMC" />
<result property="hwbm" column="HWBM" />
<result property="hwmc" column="HWMC" />
+ <result property="wmsFlag" column="wms_flag" />
</resultMap>
<sql id="Base_Column_List">
- PK_RACK,PK_STORDOC,CKBM,CKMC,HWBM,HWMC
+ PK_RACK,PK_STORDOC,CKBM,CKMC,HWBM,HWMC,
+ wms_flag
</sql>
</mapper>
diff --git a/src/main/resources/mapper/nc/NccJcQilibcBarcodeflowWmsMapper.xml b/src/main/resources/mapper/nc/NccJcQilibcBarcodeflowWmsMapper.xml
index 8e14106..fb79aaa 100644
--- a/src/main/resources/mapper/nc/NccJcQilibcBarcodeflowWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccJcQilibcBarcodeflowWmsMapper.xml
@@ -15,10 +15,11 @@
<result property="memo" column="MEMO" />
<result property="vbillno" column="VBILLNO" />
<result property="nastnum" column="NASTNUM" />
+ <result property="wmsFlag" column="wms_flag" />
</resultMap>
<sql id="Base_Column_List">
PK_BARCODE,TS,VBARCODE,INFLA,ASNNUM,PK_MATERIAL,
- PK_STORDOC,MEMO,VBILLNO,NASTNUM
+ PK_STORDOC,MEMO,VBILLNO,NASTNUM,wms_flag
</sql>
</mapper>
diff --git a/src/main/resources/mapper/nc/NccJcRyWmsMapper.xml b/src/main/resources/mapper/nc/NccJcRyWmsMapper.xml
index 4c5d93f..0432632 100644
--- a/src/main/resources/mapper/nc/NccJcRyWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccJcRyWmsMapper.xml
@@ -16,10 +16,12 @@
<result property="ssbmbm" column="SSBMBM" />
<result property="ssbmmc" column="SSBMMC" />
<result property="sssyb" column="SSSYB" />
+ <result property="wmsFlag" column="wms_flag" />
</resultMap>
<sql id="Base_Column_List">
PK_PSNDOC,QYZT,RYBM,RYMC,PK_ORG,SSZZBM,
- SSZZMC,PK_DEPT,SSBMBM,SSBMMC,SSSYB
+ SSZZMC,PK_DEPT,SSBMBM,SSBMMC,SSSYB,
+ wms_flag
</sql>
</mapper>
diff --git a/src/main/resources/mapper/nc/NccJcWlflWmsMapper.xml b/src/main/resources/mapper/nc/NccJcWlflWmsMapper.xml
index d183cdd..762f423 100644
--- a/src/main/resources/mapper/nc/NccJcWlflWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccJcWlflWmsMapper.xml
@@ -12,10 +12,11 @@
<result property="sjflmc" column="SJFLMC" />
<result property="wljbfl" column="WLJBFL" />
<result property="code1" column="CODE1" />
+ <result property="wmsFlag" column="wms_flag" />
</resultMap>
<sql id="Base_Column_List">
PK_MARBASCLASS,CODE,NAME,SJFLBM,SJFLMC,WLJBFL,
- CODE1
+ CODE1,wms_flag
</sql>
</mapper>
diff --git a/src/main/resources/mapper/nc/NccOrgCorpWmsMapper.xml b/src/main/resources/mapper/nc/NccOrgCorpWmsMapper.xml
index 7c0a7ab..9a68217 100644
--- a/src/main/resources/mapper/nc/NccOrgCorpWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccOrgCorpWmsMapper.xml
@@ -8,9 +8,10 @@
<result property="code" column="CODE" />
<result property="name" column="NAME" />
<result property="shortname" column="SHORTNAME" />
+ <result property="wmsFlag" column="wms_flag" />
</resultMap>
<sql id="Base_Column_List">
- CODE,NAME,SHORTNAME
+ CODE,NAME,SHORTNAME,wms_flag
</sql>
</mapper>
diff --git a/src/main/resources/mapper/nc/NccSaleXsfhmxWmsMapper.xml b/src/main/resources/mapper/nc/NccSaleXsfhmxWmsMapper.xml
index ab390ed..5f2ad6c 100644
--- a/src/main/resources/mapper/nc/NccSaleXsfhmxWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccSaleXsfhmxWmsMapper.xml
@@ -77,6 +77,8 @@
<result property="gssf" column="GSSF" />
<result property="kczzbm" column="KCZZBM" />
<result property="kczzmc" column="KCZZMC" />
+ <result property="vnote" column="VNOTE" />
+ <result property="wmsFlag" column="wms_flag" />
</resultMap>
<sql id="Base_Column_List">
@@ -94,6 +96,13 @@
CFIRSTID,CFIRSTBID,VSRCCODE,CSRCID,CSRCBID,
DSENDDATE,NTOTALOUTNUM,BOUTENDFLAG,NTOTALNOTOUTNUM,BDR,
TS,HTS,SHSF,GSSF,KCZZBM,
- KCZZMC
+ KCZZMC,VNOTE,wms_flag
</sql>
+
+
+ <select id="selectXsfh" resultType="java.lang.String">
+ select distinct
+ CDELIVERYID
+ from ncc_sale_xsfhmx_wms where wms_flag != 1 and fstatusflag = 2 limit 100
+ </select>
</mapper>
diff --git a/src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml b/src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml
index b385728..4334b14 100644
--- a/src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml
@@ -58,6 +58,7 @@
<result property="ljrkzsl" column="LJRKZSL" />
<result property="dr" column="DR" />
<result property="ts" column="TS" />
+ <result property="wmsFlag" column="wms_flag" />
</resultMap>
<sql id="Base_Column_List">
@@ -71,6 +72,12 @@
ZSJFLMC,ZDW,FDW,KCZT,VBATCHCODE,
VDEF1,VDEF2,VDEF3,KHBM,KHMC,
KHJC,YZZSL,YZFSL,LJCKZSL,LJRKZSL,
- DR,TS
+ DR,TS,wms_flag
</sql>
+
+ <select id="selectZk" resultType="java.lang.String">
+ select distinct
+ CDELIVERYID
+ from ncc_sale_xsfhmx_wms where wms_flag != 1 and fstatusflag = 2 limit 100
+ </select>
</mapper>
diff --git a/src/main/resources/mapper/nc/VGetBdMaterialMapper.xml b/src/main/resources/mapper/nc/VGetBdMaterialMapper.xml
index eb5ceaa..bdb15a8 100644
--- a/src/main/resources/mapper/nc/VGetBdMaterialMapper.xml
+++ b/src/main/resources/mapper/nc/VGetBdMaterialMapper.xml
@@ -47,6 +47,7 @@
<result property="zsjflmc" column="ZSJFLMC" />
<result property="sjflbm" column="SJFLBM" />
<result property="sjflmc" column="SJFLMC" />
+ <result property="wmsFlag" column="wms_flag" />
</resultMap>
<sql id="Base_Column_List">
@@ -58,6 +59,6 @@
搴撳瓨鐘舵��,鍗曚綅閲嶉噺,鍚敤鐘舵��,鏄惁澶栬锤,娴峰叧缂栫爜,
娴峰叧鍚嶇О,鎶ュ叧鑻辨枃鍚�,鍙戠エ鍚嶇О,鍒涘缓鏃堕棿,鏈�鍚庝慨鏀规椂闂�,
DEFCODE,DEFNAME,ZSJFLBM,ZSJFLMC,SJFLBM,
- SJFLMC
+ SJFLMC,wms_flag
</sql>
</mapper>
--
Gitblit v1.9.1