From 4315c959d95e106ff9e18c28398087aeee7d077d Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 09 三月 2026 15:12:08 +0800
Subject: [PATCH] 对接接口开发
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 23 ++-
src/main/java/com/zy/asrs/controller/OpenController.java | 33 +++++
src/main/java/com/zy/asrs/entity/param/OpenOrderParam.java | 145 ++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 119 +++++++++++++++++++
src/main/java/com/zy/asrs/service/OpenService.java | 6 +
5 files changed, 316 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 404c4a6..b9f108e 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -54,6 +54,13 @@
return R.ok().add(tokenVo);
}
+ /**
+ * 鐗╂枡鍩虹淇℃伅鍚屾
+ * @param appkey
+ * @param param
+ * @param request
+ * @return
+ */
@PostMapping("/erp/mat/sync")
// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfoV2(@RequestHeader(required = false) String appkey,
@@ -73,6 +80,32 @@
return R.ok();
}
+ /**
+ * 鍏�/鍑哄簱閫氱煡鍗曚笅鍙�
+ * @param param
+ * @return
+ */
+ @PostMapping("/erp/order/add")
+ public synchronized R addOrder(@RequestBody OpenOrderParam param){
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getOrderNo())){
+ return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderType())){
+ return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getWkType())){
+ return R.error("涓氬姟绫诲瀷[wkType]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderItems())){
+ return R.error("璁㈠崟鏄庣粏[orderItems]涓嶈兘涓虹┖");
+ }
+ openService.orderCreate(param);
+ return R.ok();
+ }
+
@PostMapping("/order/matSync/default/v1")
// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 886330b..5f594ac 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -317,34 +317,37 @@
/**
* 澶囩敤1
*/
- @ApiModelProperty(value= "澶囩敤1")
- private String standby1 = "1";
+ @ApiModelProperty(value= "琛屽唴鐮� 鍞竴鏍囪瘑")
+ @TableField("standby1")
+ private String standby1;
/**
* 澶囩敤2
*/
- @ApiModelProperty(value= "澶囩敤2")
- private String standby2 = "1";
+ @ApiModelProperty(value= "鎵樼洏鐮�")
+ @TableField("standby2")
+ private String standby2;
/**
* 澶囩敤3
*/
- @ApiModelProperty(value= "澶囩敤3")
- private String standby3 = "1";
+ @ApiModelProperty(value= "璁″垝璺熻釜鍙�")
+ @TableField("standby3")
+ private String standby3;
/**
* 澶囩敤1
*/
- @ApiModelProperty(value= "澶囩敤1")
+ @ApiModelProperty(value= "寤鸿鍏ュ簱浠撳簱")
@TableField("box_type1")
- private String boxType1 = "1";
+ private String boxType1;
/**
* 澶囩敤2
*/
- @ApiModelProperty(value= "澶囩敤2")
+ @ApiModelProperty(value= "寤鸿鍑哄簱浠撳簱")
@TableField("box_type2")
- private String boxType2 = "1";
+ private String boxType2;
/**
* 澶囩敤3
diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderParam.java
new file mode 100644
index 0000000..a91937b
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderParam.java
@@ -0,0 +1,145 @@
+package com.zy.asrs.entity.param;
+
+import com.core.common.Cools;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class OpenOrderParam {
+
+ /**
+ * 璁㈠崟缂栫爜
+ */
+ private String orderNo;
+
+ /**
+ * 鍗曟嵁鍐呯爜 鍞竴鏍囪瘑 鑻ユ病鏈夊彲浠ヨˉ鍏呰鍗曠紪鐮�
+ */
+ private String orderInternalCode;
+
+ /**
+ * 璁㈠崟绫诲瀷 1 鍑哄簱鍗� 2 鍏ュ簱鍗� 3 璋冩嫧鍗�
+ */
+ private long orderType;
+
+ /**
+ * 涓氬姟绫诲瀷 鏋氫妇绫诲瀷 閲囪喘鍏ュ簱鍗� 閿�鍞��璐у崟 閿�鍞嚭搴撳崟 璋冩嫧鐢宠鍗�
+ */
+ private String wkType;
+
+ /**
+ * 涓氬姟鏃ユ湡 鏃堕棿鎴� 绮剧‘鍒扮
+ */
+ private Date businessTime;
+
+ /**
+ * 鍒涘缓鏃ユ湡
+ */
+ private Date createTime;
+
+ /**
+ * 璁㈠崟鏄庣粏
+ */
+ private List<OrderItem> orderItems;
+
+ /**
+ * 鍏�/鍑哄簱鎺ラ┏绔欑偣 锛堝嚭搴撴椂灏嗙墿鏂欏嚭搴撳悗杩愯緭鑷宠绔欑偣 鍏ュ簱鏃朵粠璇ョ珯鐐瑰皢鐗╂枡杩愬洖搴撲腑锛� 闇�瑕佸垯琛ュ厖 鍚﹀垯涓嶇敤琛ュ厖
+ */
+ private String stationId;
+
+ /**
+ * 鎿嶄綔绫诲瀷 1 鏂板锛堥粯璁わ級 2 淇敼 3 鍙栨秷
+ */
+ private Integer operateType;
+
+ @Data
+ @AllArgsConstructor
+ public static class OrderItem {
+ /**
+ * 琛屽唴鐮� 鍞竴鏍囪瘑
+ */
+ private String lineId;
+
+ /**
+ * 鐗╂枡缂栫爜
+ */
+ private String matNr;
+
+ /**
+ * 鐗╂枡鍚嶇О
+ */
+ private String makTx;
+
+ /**
+ * 鏁伴噺 灏忔暟鐐归粯璁�4浣�
+ */
+ private Double anfme;
+
+ /**
+ * 瑙勬牸
+ */
+ private String spec;
+
+ /**
+ * 鍨嬪彿
+ */
+ private String model;
+
+ /**
+ * 鍗曚綅
+ */
+ private String unit;
+
+ /**
+ * 鎵规鍙�
+ */
+ private String batch;
+
+ /**
+ * 鎵樼洏鐮� 鑻ヨ鍗曠被鍨嬩负鍑哄簱鍗曟椂 鍒欐寚瀹氳鎵樼洏鍑哄簱
+ */
+ private String palletId;
+
+ /**
+ * 璁″垝璺熻釜鍙�
+ */
+ private String planNo;
+
+ /**
+ * 寤鸿鍏ュ簱浠撳簱
+ */
+ private String targetWareHouseId;
+
+ /**
+ * 寤鸿鍑哄簱浠撳簱
+ */
+ private String sourceWareHouseId;
+
+ public static boolean hasLineNumber(List<OrderItem> list, OrderItem orderItem) {
+ for (OrderItem item : list) {
+ if (item.getLineId().equals(orderItem.getLineId()) && item.getMatNr().equals(orderItem.getMatNr()) && Cools.eq(item.getModel(),orderItem.getModel()) &&
+ Cools.eq(item.getBatch(),orderItem.getBatch()) && Cools.eq(item.getPalletId(),orderItem.getPalletId()) && Cools.eq(item.getPlanNo(),orderItem.getPlanNo()) &&
+ Cools.eq(item.getSourceWareHouseId(),orderItem.getSourceWareHouseId()) && Cools.eq(item.getSpec(),orderItem.getSpec()) && Cools.eq(item.getUnit(),orderItem.getUnit()) &&
+ Cools.eq(item.getTargetWareHouseId(),orderItem.getTargetWareHouseId())){
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public static OrderItem findLineNumber(List<OrderItem> list, String lineId, String matNr, String makTx, Double anfme, String spec, String model, String unit, String batch, String palletId, String planNo, String targetWarehouseId, String sourceWarehouseId) {
+ for (OrderItem orderItem : list) {
+ if (orderItem.getLineId().equals(lineId) && orderItem.getMatNr().equals(matNr) && Cools.eq(orderItem.getModel(),model) &&
+ Cools.eq(orderItem.getBatch(),batch) && Cools.eq(orderItem.getPalletId(),palletId) && Cools.eq(orderItem.getPlanNo(),planNo) &&
+ Cools.eq(orderItem.getSourceWareHouseId(),sourceWarehouseId) && Cools.eq(orderItem.getSpec(),spec) && Cools.eq(orderItem.getUnit(),unit) &&
+ Cools.eq(orderItem.getTargetWareHouseId(),targetWarehouseId)){
+ return orderItem;
+ }
+ }
+ return null;
+ }
+ }
+}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 45df305..bb6bfd5 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -60,4 +60,10 @@
boolean agvBindAndBin(String taskNo);
boolean taskArmOrderResult(OrderArmEndParam param);
List<PickWrkDetlListParam> getPickList(PdaPickListParam param);
+
+ /**
+ * 鍏�/鍑哄簱閫氱煡鍗曚笅鍙�
+ * @param param
+ */
+ void orderCreate(OpenOrderParam param);
}
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 16387bb..d845703 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -947,6 +947,125 @@
return result;
}
+ /**
+ * 鍏�/鍑哄簱閫氱煡鍗曚笅鍙�
+ * @param param
+ */
+ @Override
+ public void orderCreate(OpenOrderParam param) {
+ Order order = orderService.selectByNo(param.getOrderNo());
+ if (!Cools.isEmpty(order)){
+ throw new CoolException(param.getOrderNo() + "璁㈠崟宸插瓨鍦紝璇峰嬁閲嶅鍒涘缓");
+ }
+ Date now = new Date();
+ order = new Order(
+ String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ param.getOrderNo(), // 璁㈠崟缂栫爜[闈炵┖]
+ DateUtils.convert(now), //鍗曟嵁鏃ユ湡
+ param.getOrderType(), //璁㈠崟绫诲瀷
+ null, //椤圭洰缂栧彿
+ null, //椤圭洰鍚嶇О 瀹㈡埛PO鍙�
+ null, //璋冩嫧椤圭洰缂栧彿
+ null, //鍒濆绁ㄦ嵁鍙�
+ null, //绁ㄦ嵁鍙�
+ null, //瀹㈡埛缂栧彿
+ null, //瀹㈡埛
+ param.getOrderInternalCode(), //鍗曟嵁鍐呯爜
+ param.getWkType(), //涓氬姟绫诲瀷
+ null, //鍚堣閲戦
+ null, //浼樻儬鐜�
+ null, //浼樻儬閲戦
+ null, //閿�鍞垨閲囪喘璐圭敤鍚堣
+ null, //瀹炰粯閲戦
+ null, //浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处
+ null, //涓氬姟鍛�
+ null, //缁撶畻澶╂暟
+ null, //閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻
+ null, //閭垂
+ param.getBusinessTime(), //涓氬姟鏃ユ湡
+ param.getCreateTime(), //鍒涘缓鏃ユ湡
+ null, //鐗╂祦鍚嶇О
+ null, //鐗╂祦鍗曞彿
+ 1L, //璁㈠崟鐘舵��
+ 1, //鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ 9527L, //娣诲姞浜哄憳
+ now, //娣诲姞鏃堕棿
+ 9527L, //淇敼浜哄憳
+ now, //淇敼鏃堕棿
+ param.getStationId(), //鍏�/鍑哄簱鎺ラ┏绔欑偣
+ param.getOperateType() // 鎿嶄綔绫诲瀷 1.鏂板 2.淇敼 3.鍙栨秷
+ );
+ if (!orderService.insert(order)){
+ throw new CoolException("淇濆瓨璁㈠崟涓绘。澶辫触,璇疯仈绯荤鐞嗗憳锛�"+order);
+ }
+ List<OpenOrderParam.OrderItem> list = new ArrayList<>();
+ List<OpenOrderParam.OrderItem> orderItems = param.getOrderItems();
+ for (OpenOrderParam.OrderItem item : orderItems){
+ OpenOrderParam.OrderItem orderItem = new OpenOrderParam.OrderItem(
+ item.getLineId(),
+ item.getMatNr(),
+ item.getMakTx(),
+ item.getAnfme(),
+ item.getSpec(),
+ item.getModel(),
+ item.getUnit(),
+ item.getBatch(),
+ item.getPalletId(),
+ item.getPlanNo(),
+ item.getTargetWareHouseId(),
+ item.getSourceWareHouseId()
+ );
+ if (OpenOrderParam.OrderItem.hasLineNumber(list,orderItem)){
+ OpenOrderParam.OrderItem oi = OpenOrderParam.OrderItem.findLineNumber(
+ list,
+ item.getLineId(),
+ item.getMatNr(),
+ item.getMakTx(),
+ item.getAnfme(),
+ item.getSpec(),
+ item.getModel(),
+ item.getUnit(),
+ item.getBatch(),
+ item.getPalletId(),
+ item.getPlanNo(),
+ item.getTargetWareHouseId(),
+ item.getSourceWareHouseId()
+ );
+ assert oi != null;
+ oi.setAnfme(oi.getAnfme() + orderItem.getAnfme());
+ } else {
+ list.add(orderItem);
+ }
+ }
+ for (OpenOrderParam.OrderItem orderItem : list) {
+ Mat mat = matService.selectByMatnr(orderItem.getMatNr());
+ if (Cools.isEmpty(mat)){
+ throw new CoolException("璁㈠崟鏄庣粏涓殑鍟嗗搧缂栧彿涓嶅瓨鍦細" + orderItem.getMatNr());
+ }
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ orderDetl.setOrderNo(order.getOrderNo()); // 璁㈠崟缂栧彿
+ orderDetl.setOrderId(order.getId()); // 璁㈠崟鍐呯爜
+ orderDetl.setStandby1(order.getTel()); // 琛屽唴鐮� 鍞竴鏍囪瘑
+ orderDetl.setAnfme(orderItem.getAnfme()); // 璁㈠崟鏁伴噺
+ orderDetl.setBarcode(orderItem.getBatch()); // 鎵规
+ orderDetl.setStandby2(orderItem.getPalletId()); // 鎵樼洏鐮�
+ orderDetl.setStandby3(orderItem.getPlanNo()); // 璁″垝璺熻釜鍙�
+ orderDetl.setBoxType1(orderItem.getSourceWareHouseId()); // 寤鸿鍏ュ簱浠撳簱
+ orderDetl.setBoxType2(orderItem.getTargetWareHouseId()); // 寤鸿鍑哄簱浠撳簱
+ orderDetl.setCreateBy(9527L);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(9527L);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+// orderDetl.setPakinPakoutStatus(1);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("淇濆瓨璁㈠崟鏄庣粏澶辫触,璇疯仈绯荤鐞嗗憳锛�"+orderDetl);
+ }
+ }
+ }
+
@Override
@Transactional
public List<AgvLocListDetlParam> getAgvLocList(AgvLocListParam param) {
--
Gitblit v1.9.1