From 795256bebd416d1f5d2259b01144a300207aab4c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 01 七月 2025 09:44:14 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java | 15 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/Utils.java | 18 +++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java | 15 ++
zy-asrs-wms/src/main/resources/application.yml | 6
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java | 3
zy-asrs-admin/src/components/locDetl/selectLocDetl/index.vue | 21 +++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java | 7
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocMapController.java | 57 ++++++--
zy-asrs-admin/src/components/orderDetl/show.vue | 20 +++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java | 1
zy-asrs-admin/src/views/loc/locDetl/index.vue | 35 ++++-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/LocMastInitParam.java | 47 +++++++
zy-asrs-admin/src/components/locDetl/show.vue | 28 +++-
zy-asrs-admin/src/components/order/order/edit.vue | 44 +------
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java | 12 +
15 files changed, 249 insertions(+), 80 deletions(-)
diff --git a/zy-asrs-admin/src/components/locDetl/selectLocDetl/index.vue b/zy-asrs-admin/src/components/locDetl/selectLocDetl/index.vue
index 4aba7ab..6e27d01 100644
--- a/zy-asrs-admin/src/components/locDetl/selectLocDetl/index.vue
+++ b/zy-asrs-admin/src/components/locDetl/selectLocDetl/index.vue
@@ -64,6 +64,27 @@
...getColumnSearchProps('matnr'),
},
{
+ title: formatMessage('db.man_loc_detl.maktx', '鍟嗗搧鍚嶇О'),
+ dataIndex: 'maktx',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('maktx'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.specs', '瑙勬牸'),
+ dataIndex: 'specs',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('specs'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.model', '鍨嬪彿'),
+ dataIndex: 'model',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('model'),
+ },
+ {
title: formatMessage('db.man_loc_detl.order_no', '璁㈠崟鍙�'),
dataIndex: 'orderNo',
width: 140,
diff --git a/zy-asrs-admin/src/components/locDetl/show.vue b/zy-asrs-admin/src/components/locDetl/show.vue
index a5ca11d..8c3fe0f 100644
--- a/zy-asrs-admin/src/components/locDetl/show.vue
+++ b/zy-asrs-admin/src/components/locDetl/show.vue
@@ -37,13 +37,6 @@
...getColumnSearchProps('locNo'),
},
{
- title: formatMessage('db.man_loc_detl.mat_id', '鍟嗗搧'),
- dataIndex: 'matId$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('matId$'),
- },
- {
title: formatMessage('db.man_loc_detl.matnr', '鍟嗗搧缂栧彿'),
dataIndex: 'matnr',
width: 140,
@@ -51,6 +44,27 @@
...getColumnSearchProps('matnr'),
},
{
+ title: formatMessage('db.man_loc_detl.maktx', '鍟嗗搧鍚嶇О'),
+ dataIndex: 'maktx',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('maktx'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.specs', '瑙勬牸'),
+ dataIndex: 'specs',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('specs'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.model', '鍨嬪彿'),
+ dataIndex: 'model',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('model'),
+ },
+ {
title: formatMessage('db.man_loc_detl.order_no', '璁㈠崟鍙�'),
dataIndex: 'orderNo',
width: 140,
diff --git a/zy-asrs-admin/src/components/order/order/edit.vue b/zy-asrs-admin/src/components/order/order/edit.vue
index f3a5589..abd0d30 100644
--- a/zy-asrs-admin/src/components/order/order/edit.vue
+++ b/zy-asrs-admin/src/components/order/order/edit.vue
@@ -132,10 +132,6 @@
<a-form-item :label="formatMessage('db.man_order.order_no', '璁㈠崟缂栧彿')" name="orderNo">
<a-input v-model:value="formData.orderNo" />
</a-form-item>
- <!-- <a-form-item :label="formatMessage('db.man_order.order_time', '鍗曟嵁鏃ユ湡')" name="orderTime"
- style="width: 250px;">
- <a-input v-model:value="formData.orderTime" />
- </a-form-item> -->
<a-form-item :label="formatMessage('db.man_order.order_type', '鍗曟嵁绫诲瀷')" name="orderType">
<a-select v-model:value="formData.orderType" :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
style="width: 100%" show-search :options="orderTypeQueryList" optionFilterProp="label"
@@ -148,45 +144,21 @@
optionLabelProp="label">
</a-select>
</a-form-item>
- <!-- <a-form-item :label="formatMessage('db.man_order.status', '鐘舵��')" name="status" >
- <a-select v-model:value="formData.status" :options="[
- { label: '姝ｅ父', value: 1 },
- { label: '绂佺敤', value: 0 },
- ]">
- </a-select>
- </a-form-item> -->
- <!-- <a-form-item :label="formatMessage('db.man_order.create_time', '娣诲姞鏃堕棿')" name="createTime"
- style="width: 250px;">
- <a-date-picker v-model:value="formData.createTime" show-time format="YYYY-MM-DD HH:mm:ss"
- value-format="YYYY-MM-DD HH:mm:ss" />
+ <!-- <a-form-item :label="formatMessage('db.man_order.order_no', '鐗╂祦鍏徃')" name="orderNo" >
+ <a-input v-model:value="formData.orderNo" />
</a-form-item>
- <a-form-item :label="formatMessage('db.man_order.create_by', '娣诲姞浜哄憳')" name="createBy"
- style="width: 250px;">
- <a-select v-model:value="formData.createBy" :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
- style="width: 100%" show-search :options="userQueryList" optionFilterProp="label"
- optionLabelProp="label">
- </a-select>
+ <a-form-item :label="formatMessage('db.man_order.order_no', '蹇�掑崟鍙�')" name="orderNo">
+ <a-input v-model:value="formData.orderNo"/>
</a-form-item>
- <a-form-item :label="formatMessage('db.man_order.update_time', '淇敼鏃堕棿')" name="updateTime"
- style="width: 250px;">
- <a-date-picker v-model:value="formData.updateTime" show-time format="YYYY-MM-DD HH:mm:ss"
- value-format="YYYY-MM-DD HH:mm:ss" />
+ <a-form-item :label="formatMessage('db.man_order.order_no', '鐗╂祦鍏徃')" name="orderNo" >
+ <a-input v-model:value="formData.orderNo"/>
</a-form-item>
- <a-form-item :label="formatMessage('db.man_order.update_by', '淇敼浜哄憳')" name="updateBy"
- style="width: 250px;">
- <a-select v-model:value="formData.updateBy" :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
- style="width: 100%" show-search :options="userQueryList" optionFilterProp="label"
- optionLabelProp="label">
- </a-select>
+ <a-form-item :label="formatMessage('db.man_order.order_no', '蹇�掑崟鍙�')" name="orderNo">
+ <a-input v-model:value="formData.orderNo"/>
</a-form-item> -->
- <!-- <a-form-item :label="formatMessage('db.man_order.memo', '澶囨敞')" name="memo" style="width: 250px;">
- <a-input v-model:value="formData.memo" />
- </a-form-item> -->
-
<a-form-item :label="formatMessage('db.man_order.update_time', '璁㈠崟鏄庣粏')" name="orderDetl">
<OrderDetlComponent ref="orderDetlChild" v-if="open" />
</a-form-item>
-
<a-form-item>
<a-button type="primary" html-type="submit" ref="submitButton"
style="visibility: hidden;">Submit</a-button>
diff --git a/zy-asrs-admin/src/components/orderDetl/show.vue b/zy-asrs-admin/src/components/orderDetl/show.vue
index 0b5c321..b80265d 100644
--- a/zy-asrs-admin/src/components/orderDetl/show.vue
+++ b/zy-asrs-admin/src/components/orderDetl/show.vue
@@ -184,6 +184,7 @@
let result = resp.data;
if(result.data != null) {
orderInfo.value = result.data;
+ console.log(result.data);
}
})
}
@@ -237,6 +238,25 @@
鍗曟嵁鐘舵�侊細{{ orderInfo.orderSettle$ }}
</h3>
</div>
+ <div>
+ <h3>
+ 鏁伴噺锛歿{ orderInfo.waitQty }}
+ </h3>
+ <h3>
+ 鐗╂祦鍚嶇О锛歿{ orderInfo.logisticsName }}
+ </h3>
+ <h3>
+ 蹇�掑崟鍙凤細{{ orderInfo.logistics }}
+ </h3>
+ </div>
+ <div>
+ <h3>
+ 鏀惰揣鍦板潃锛歿{ orderInfo.address }}
+ </h3>
+ <h3>
+ 鑱旂郴鐢佃瘽锛歿{ orderInfo.phone }}
+ </h3>
+ </div>
<div class="qrcode">
<a-qrcode :value="orderInfo.orderNo" :size="100" :bordered="false" />
</div>
diff --git a/zy-asrs-admin/src/views/loc/locDetl/index.vue b/zy-asrs-admin/src/views/loc/locDetl/index.vue
index 2e18421..266438f 100644
--- a/zy-asrs-admin/src/views/loc/locDetl/index.vue
+++ b/zy-asrs-admin/src/views/loc/locDetl/index.vue
@@ -69,13 +69,6 @@
...getColumnSearchProps('locNo'),
},
{
- title: formatMessage('db.man_loc_detl.mat_id', '鍟嗗搧'),
- dataIndex: 'matId$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('matId$'),
- },
- {
title: formatMessage('db.man_loc_detl.matnr', '鍟嗗搧缂栧彿'),
dataIndex: 'matnr',
width: 140,
@@ -83,6 +76,34 @@
...getColumnSearchProps('matnr'),
},
{
+ title: formatMessage('db.man_loc_detl.maktx', '鍟嗗搧鍚嶇О'),
+ dataIndex: 'maktx',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('maktx'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.specs', '瑙勬牸'),
+ dataIndex: 'specs',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('specs'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.model', '鍨嬪彿'),
+ dataIndex: 'model',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('model'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.dewell', '鍏ュ簱鏃堕棿'),
+ dataIndex: 'dewell$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('dewell$'),
+ },
+ {
title: formatMessage('db.man_loc_detl.order_no', '璁㈠崟鍙�'),
dataIndex: 'orderNo',
width: 140,
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocMapController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocMapController.java
index 7a0bb7d..d1c3c19 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocMapController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocMapController.java
@@ -8,6 +8,7 @@
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wms.asrs.entity.Loc;
import com.zy.asrs.wms.asrs.entity.enums.LocStsType;
+import com.zy.asrs.wms.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.wms.asrs.service.LocService;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
@@ -153,32 +154,56 @@
@OperationLog("鍒濆鍖栧簱浣�")
@PostMapping("/locMap/init")
@Transactional
- public R init(@RequestBody LocMap locMap) {
- Integer mapLev = locMap.getMapLev();
+ public R init(@RequestBody LocMastInitParam param) {
+// Integer mapLev = locMap.getMapLev();
- locService.remove(new LambdaQueryWrapper<Loc>().eq(Loc::getLev1, mapLev));
+// locService.remove(new LambdaQueryWrapper<Loc>().eq(Loc::getLev1, mapLev));
//瑙ｆ瀽json鍦板浘鏁版嵁
- List<ArrayList> arrayLists = JSON.parseArray(locMap.getData(), ArrayList.class);
- int rowIdx = 0;
- for (ArrayList row : arrayLists) {
- int bayIdx = 0;
- for (Object bay : row) {
- JSONObject data = JSON.parseObject(JSON.toJSONString(bay));
- if (data.getInteger("value") == 0) {
+// List<ArrayList> arrayLists = JSON.parseArray(locMap.getData(), ArrayList.class);
+// int rowIdx = 0;
+// for (ArrayList row : arrayLists) {
+// int bayIdx = 0;
+// for (Object bay : row) {
+// JSONObject data = JSON.parseObject(JSON.toJSONString(bay));
+// if (data.getInteger("value") == 0) {
+// Loc loc = new Loc();
+// loc.setRow1(rowIdx);
+// loc.setBay1(bayIdx);
+// loc.setLev1(mapLev);
+// loc.setLocStsId(LocStsType.O.val());
+// loc.setLocNo(Utils.getPlatLocNo(rowIdx, bayIdx, mapLev));
+// locService.save(loc);
+// }
+// bayIdx++;
+// }
+// rowIdx++;
+// }
+
+ List<Loc> list = new ArrayList<>();
+ Integer chanl = 0; //榛樿绗竴宸烽亾
+ for (int r = param.getStartRow(); r <= param.getEndRow(); r++) {
+// if (r % param.getChannel() == 1) {
+// chanl ++;
+// }
+ for (int b = param.getStartBay(); b <= param.getEndBay(); b++) {
+ for (int l = param.getStartLev(); l <= param.getEndLev(); l++) {
+ // 鑾峰彇搴撲綅鍙�
+ String locNo = Utils.getPlatLocNo(r, b, l);
Loc loc = new Loc();
- loc.setRow1(rowIdx);
- loc.setBay1(bayIdx);
- loc.setLev1(mapLev);
+ loc.setRow1(r);
+ loc.setBay1(b);
+ loc.setLev1(l);
loc.setLocStsId(LocStsType.O.val());
- loc.setLocNo(Utils.getLocNo(rowIdx, bayIdx, mapLev));
+ loc.setLocNo(locNo);
locService.save(loc);
+ list.add(loc);
}
- bayIdx++;
}
- rowIdx++;
}
+
+
return R.ok("娣诲姞鎴愬姛");
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
index cf8751e..acab6ee 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
@@ -7,6 +7,7 @@
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.MatField;
+import com.zy.asrs.wms.asrs.entity.OrderDetl;
import com.zy.asrs.wms.asrs.entity.OrderType;
import com.zy.asrs.wms.asrs.entity.enums.OrderSettleType;
import com.zy.asrs.wms.asrs.entity.param.CreateOrderParam;
@@ -14,6 +15,7 @@
import com.zy.asrs.wms.asrs.entity.template.OrderTemplate;
import com.zy.asrs.wms.asrs.service.MatFieldService;
import com.zy.asrs.wms.asrs.service.OrderTypeService;
+import com.zy.asrs.wms.asrs.service.impl.OrderDetlServiceImpl;
import com.zy.asrs.wms.common.annotation.CacheData;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
@@ -43,6 +45,8 @@
private OrderTypeService orderTypeService;
@Autowired
private MatFieldService matFieldService;
+ @Autowired
+ private OrderDetlServiceImpl orderDetlService;
@PreAuthorize("hasAuthority('asrs:order:list')")
@PostMapping("/order/page")
@@ -147,7 +151,13 @@
@GetMapping("/order/{id}")
// @CacheData(tableName = {"man_order"})
public R get(@PathVariable("id") Long id) {
- return R.ok().add(orderService.getById(id));
+ Order order = orderService.getById(id);
+ List<OrderDetl> detls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()));
+ if (!detls.isEmpty()) {
+ Double sum = detls.stream().mapToDouble(OrderDetl::getAnfme).sum();
+ order.setWaitQty(sum);
+ }
+ return R.ok().add(order);
}
@PreAuthorize("hasAuthority('asrs:order:save')")
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java
index 0f02624..cef0d5d 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.zy.asrs.common.utils.Synchro;
+import com.zy.asrs.framework.common.DateUtils;
import com.zy.asrs.wms.asrs.service.LocService;
import com.zy.asrs.wms.asrs.service.MatFieldService;
import com.zy.asrs.wms.asrs.service.MatService;
@@ -137,6 +138,7 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+
/**
* 搴撳瓨鍐荤粨 1: 鍐荤粨 0: 姝ｅ父
*/
@@ -200,6 +202,7 @@
return null;
}
+
public String getHostId$(){
HostService service = SpringUtils.getBean(HostService.class);
Host host = service.getById(this.hostId);
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java
index 4e8c095..3f2c2d4 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java
@@ -66,6 +66,21 @@
@ApiModelProperty(value= "鍗曟嵁鐘舵��")
private Long orderSettle;
+ @ApiModelProperty("鐗╂祦鍚嶇О")
+ private String logisticsName;
+
+ @ApiModelProperty("鏀惰揣鍦板潃")
+ private String address;
+
+ @ApiModelProperty("鑱旂郴鐢佃瘽")
+ private String phone;
+
+ @ApiModelProperty("蹇�掑崟鍙�")
+ private String logistics;
+
+ @ApiModelProperty("璁㈠崟鏁伴噺")
+ @TableField(exist = false)
+ private Double waitQty;
/**
* 鎵�灞炴満鏋�
*/
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java
index 6b5a23f..8b5f33c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java
@@ -7,6 +7,7 @@
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.zy.asrs.common.utils.Synchro;
import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.DateUtils;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.wms.asrs.service.LocService;
import com.zy.asrs.wms.asrs.service.MatService;
@@ -16,6 +17,7 @@
import com.zy.asrs.wms.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.experimental.Delegate;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -183,15 +185,18 @@
return null;
}
- public String getMatId$(){
+ @Delegate(types = Mat.class)
+ public Mat getMatId$(){
MatService service = SpringUtils.getBean(MatService.class);
Mat mat = service.getById(this.matId);
- if (!Cools.isEmpty(mat)){
- return String.valueOf(mat.getId());
- }
- return null;
+ return mat;
}
+ public String getDewell$() {
+ return DateUtils.diff(new Date(), createTime) + "澶�";
+ }
+
+
public String getHostId$(){
HostService service = SpringUtils.getBean(HostService.class);
Host host = service.getById(this.hostId);
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/LocMastInitParam.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/LocMastInitParam.java
new file mode 100644
index 0000000..8faec4b
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/LocMastInitParam.java
@@ -0,0 +1,47 @@
+package com.zy.asrs.wms.asrs.entity.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Created by vincent on 2020/6/13
+ */
+@Data
+@Accessors(chain = true)
+public class LocMastInitParam implements Serializable {
+
+ @ApiModelProperty("浠撳簱ID")
+ private Long warehouseId;
+
+ @ApiModelProperty("搴撳尯ID")
+ private Long areaId;
+
+ @ApiModelProperty("璧峰鎺�")
+ private Integer startRow;
+
+ @ApiModelProperty("缁堟鎺�")
+ private Integer endRow;
+
+ @ApiModelProperty("璧峰鍒�")
+ private Integer startBay;
+
+ @ApiModelProperty("缁堟鍒�")
+ private Integer endBay;
+
+ @ApiModelProperty("璧峰灞�")
+ private Integer startLev;
+
+ @ApiModelProperty("缁堟灞�")
+ private Integer endLev;
+
+ @ApiModelProperty("搴撲綅绫诲瀷")
+ private List<Long> typeIds;
+
+ @ApiModelProperty("宸烽亾")
+ private Integer channel;
+
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java
index 85dbb26..2c9d272 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java
@@ -19,10 +19,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
@Service("orderService")
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
@@ -132,7 +129,7 @@
throw new CoolException("鏇存柊鏄庣粏绱㈠紩澶辫触");
}
- mat.setUtiliz(mat.getUtiliz() + 1);
+ mat.setUtiliz(Objects.isNull(mat.getUtiliz()) ? 0 : mat.getUtiliz() + 1);
if (!matService.updateById(mat)) {
throw new CoolException("鐗╂枡浣跨敤鐜囦慨鏀瑰け璐ワ紒锛�");
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java
index 394919e..fc9ad3c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java
@@ -123,6 +123,7 @@
for (TaskDetl taskDetl : taskDetls) {
TaskDetlLog taskDetlLog = new TaskDetlLog();
taskDetlLog.sync(taskDetl);
+ taskDetlLog.setOrderId(taskDetl.getOrderId());
taskDetlLog.setId(null);
taskDetlLog.setTaskId(taskLog.getId());
if (!taskDetlLogService.save(taskDetlLog)) {
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/Utils.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/Utils.java
index 4da7962..4ba0084 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/Utils.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/Utils.java
@@ -124,10 +124,28 @@
throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
}
+ public static String getPlatLocNo(Number row, Number bay, Number lev) {
+ return "C" + zerofill(String.valueOf(row), 2) + "-" + zerofill(String.valueOf(bay), 2) + "-" + zerofill(String.valueOf(lev), 2);
+ }
+
public static String getLocNo(Number row, Number bay, Number lev) {
return row + _LINK + bay + _LINK + lev;
}
+ public static String zerofill(String msg, Integer count){
+ if (msg.length() == count){
+ return msg;
+ } else if (msg.length() > count){
+ return msg.substring(0, 16);
+ } else {
+ StringBuilder msgBuilder = new StringBuilder(msg);
+ for (int i = 0; i<count-msg.length(); i++){
+ msgBuilder.insert(0,"0");
+ }
+ return msgBuilder.toString();
+ }
+ }
+
/**
* List杞负鏍戝舰缁撴瀯
*
diff --git a/zy-asrs-wms/src/main/resources/application.yml b/zy-asrs-wms/src/main/resources/application.yml
index 5df9770..0085485 100644
--- a/zy-asrs-wms/src/main/resources/application.yml
+++ b/zy-asrs-wms/src/main/resources/application.yml
@@ -13,10 +13,10 @@
validation-timeout: 3000
connection-test-query: select 1
driver-class-name: com.mysql.cj.jdbc.Driver
-# url: jdbc:mysql://127.0.0.1:3306/wms_dev_test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
- url: jdbc:mysql://127.0.0.1:3306/ycdsasrs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://127.0.0.1:3306/wms_dev_test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+# url: jdbc:mysql://127.0.0.1:3306/ycdsasrs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
username: root
- password: 123456
+ password: 34821015
# url: jdbc:mysql://47.76.147.249:3306/wms_dev_test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
# username: wms_dev_test
# password: smjPbTrkmTMEGKaD
--
Gitblit v1.9.1