From 2442152cd669b31eb5b118e1fdf2bfd016656a5f Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期二, 02 十二月 2025 16:05:25 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderDetlMapper.xml | 3 +
src/main/java/com/zy/asrs/entity/OrderDetlPakout.java | 7 +++
src/main/java/com/zy/asrs/entity/OrderDetl.java | 7 +++
src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java | 2
src/main/java/com/zy/asrs/entity/OrderDetlPakin.java | 22 ++++++++++
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 2 +
src/main/java/com/zy/common/model/DetlDto.java | 1
src/main/resources/mapper/OrderDetlPakoutMapper.xml | 3 +
src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html | 31 ++++++++++++---
src/main/resources/mapper/OrderDetlPakinMapper.xml | 3 +
10 files changed, 73 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 048246d..61acbd7 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -367,6 +367,13 @@
@TableField("height")
private Double height;
+ /**
+ * erp鏁伴噺
+ */
+ @ApiModelProperty(value= "erp鏁伴噺")
+ @TableField("erp_anfme")
+ private Double erpAnfme;
+
public OrderDetl() {}
public OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo,Double width,Double height) {
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
index 0b2ac12..c026a1a 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
@@ -366,12 +366,21 @@
@TableField("height")
private Double height;
+ /**
+ * erp鏁伴噺
+ */
+ @ApiModelProperty(value= "erp鏁伴噺")
+ @TableField("erp_anfme")
+ private Double erpAnfme;
+
public OrderDetlPakin() {}
- public OrderDetlPakin(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ public OrderDetlPakin(Long id, Long orderId, String orderNo, Double anfme, Double workQty, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Integer pakinPakoutStatus, Long lineNumber, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double width, Double height, Double erpAnfme) {
+ this.id = id;
this.orderId = orderId;
this.orderNo = orderNo;
this.anfme = anfme;
+ this.workQty = workQty;
this.qty = qty;
this.matnr = matnr;
this.maktx = maktx;
@@ -408,6 +417,17 @@
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
+ this.pakinPakoutStatus = pakinPakoutStatus;
+ this.lineNumber = lineNumber;
+ this.standby1 = standby1;
+ this.standby2 = standby2;
+ this.standby3 = standby3;
+ this.boxType1 = boxType1;
+ this.boxType2 = boxType2;
+ this.boxType3 = boxType3;
+ this.width = width;
+ this.height = height;
+ this.erpAnfme = erpAnfme;
}
public String getOrderId$(){
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
index 830fb37..cac0882 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
@@ -366,6 +366,13 @@
@TableField("height")
private Double height;
+ /**
+ * erp鏁伴噺
+ */
+ @ApiModelProperty(value= "erp鏁伴噺")
+ @TableField("erp_anfme")
+ private Double erpAnfme;
+
public OrderDetlPakout() {}
public OrderDetlPakout(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
diff --git a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
index 50cd969..ae6c6a1 100644
--- a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
@@ -35,7 +35,7 @@
@Autowired
private BasArmMastSignService basArmMastSignService;
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
private void orderToSortLine() {
//鑾峰彇鏈笅鍙戝崟鎹�
List<String> orderNos = orderPakinService.AllStatusSatisfyOrder(0);
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 3afaa70..c6b9063 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -107,11 +107,13 @@
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
+ detlDto.setErpAnfme(detlDto.getErpAnfme() + detail.getErpAnfme());
OrderDetl orderDetl = OrderDetl.find(orderDetlList, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
assert orderDetl != null;
orderDetl.setAnfme(orderDetl.getAnfme() + detail.getAnfme());
} else {
+ dto.setErpAnfme(detail.getErpAnfme());
list.add(dto);
orderDetlList.add(detail);
}
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 4c32681..121a275 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -34,6 +34,7 @@
private String boxType3 = "1";
private Double anfme;
+ private Double erpAnfme;
public DetlDto() {
}
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 0e8827a..65b1329 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -53,6 +53,9 @@
<result column="box_type1" property="boxType1" />
<result column="box_type2" property="boxType2" />
<result column="box_type3" property="boxType3" />
+ <result column="width" property="width" />
+ <result column="height" property="height" />
+ <result column="erp_anfme" property="erpAnfme" />
</resultMap>
diff --git a/src/main/resources/mapper/OrderDetlPakinMapper.xml b/src/main/resources/mapper/OrderDetlPakinMapper.xml
index 697a89f..770bb40 100644
--- a/src/main/resources/mapper/OrderDetlPakinMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakinMapper.xml
@@ -53,6 +53,9 @@
<result column="box_type1" property="boxType1" />
<result column="box_type2" property="boxType2" />
<result column="box_type3" property="boxType3" />
+ <result column="width" property="width" />
+ <result column="height" property="height" />
+ <result column="erp_anfme" property="erpAnfme" />
</resultMap>
diff --git a/src/main/resources/mapper/OrderDetlPakoutMapper.xml b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
index 7f70401..1d8f626 100644
--- a/src/main/resources/mapper/OrderDetlPakoutMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
@@ -53,6 +53,9 @@
<result column="box_type1" property="boxType1" />
<result column="box_type2" property="boxType2" />
<result column="box_type3" property="boxType3" />
+ <result column="width" property="width" />
+ <result column="height" property="height" />
+ <result column="erp_anfme" property="erpAnfme" />
</resultMap>
<sql id="standbyAll">
diff --git a/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html b/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
index cb1107b..954b721 100644
--- a/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
+++ b/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
@@ -225,8 +225,9 @@
<!-- <el-table-column prop="boxType1" label="璐т富" min-width="80" align="center" ></el-table-column>-->
<!-- <el-table-column prop="boxType2" label="璐т富" min-width="80" align="center" ></el-table-column>-->
<el-table-column prop="boxType3" label="閲囪喘鍗曞彿" min-width="80" align="center" ></el-table-column>
- <el-table-column prop="anfme" label="鏁伴噺" min-width="100" align="center"></el-table-column>
- <el-table-column prop="status" label="鐘舵��" min-width="100" align="center" :formatter="formatStatusB"></el-table-column>
+ <el-table-column prop="anfme" label="鏁伴噺" min-width="80" align="center"></el-table-column>
+ <el-table-column prop="erpAnfme" label="erp涓嬪彂鏁伴噺" min-width="80" align="center"></el-table-column>
+ <el-table-column prop="status" label="鐘舵��" min-width="80" align="center" :formatter="formatStatusB"></el-table-column>
<!-- 鏂板鎿嶄綔鍒楋紝鏍规嵁status鍊兼帶鍒舵樉绀� -->
<el-table-column label="鏄惁涓婃姤" width="120" align="center" fixed="right">
<template slot-scope="scope">
@@ -717,13 +718,31 @@
// 鏍煎紡鍖栫姸鎬佹樉绀�
formatStatusB(row) {
if (row.status === 0) {
- return '寮傚父';
+ return '鍒濆鍖�';
} else if (row.status === 1) {
- return '涓嶄笂鎶�';
+ return '寰呭鐞�';
} else if (row.status === 2) {
- return '寰呬笂鎶�';
+ return '浣滀笟涓�';
} else if (row.status === 3) {
- return '宸蹭笂鎶�';
+ return '宸插彇娑�';
+ } else if (row.status === 4) {
+ return '宸插畬鎴�';
+ } else if (row.status === 5) {
+ return '鍑嗗鍙栨秷';
+ } else if (row.status === 6) {
+ return '涓婃姤瀹屾垚';
+ } else if (row.status === 7) {
+ return '鏁版嵁寮傚父';
+ } else if (row.status === 8) {
+ return '瀹℃牳瀹屾垚';
+ } else if (row.status === 9) {
+ return '鎻愪氦瀹屾垚';
+ } else if (row.status === 10) {
+ return '淇濆瓨瀹屾垚';
+ } else if (row.status === 98) {
+ return '涓婃姤瀹屾垚鏈畬缁�';
+ } else if (row.status === 99) {
+ return '閲嶆柊涓嬪彂';
} else {
return row.status || '鏈煡';
}
--
Gitblit v1.9.1