From 9d6a02b54ea894771c48ff660d86b48990eccb7f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 09 八月 2025 09:48:03 +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/Mat.java | 4 ++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/AuthController.java | 6 +++---
zy-asrs-admin/src/components/order/order/edit.vue | 10 +++++-----
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java | 12 +++++++++++-
4 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/zy-asrs-admin/src/components/order/order/edit.vue b/zy-asrs-admin/src/components/order/order/edit.vue
index da17a19..b93a793 100644
--- a/zy-asrs-admin/src/components/order/order/edit.vue
+++ b/zy-asrs-admin/src/components/order/order/edit.vue
@@ -40,7 +40,6 @@
const onFinish = values => {
// console.log('Success:', values);
- open.value = false;
let param = {
orderNo: formData.value.orderNo,
@@ -60,14 +59,15 @@
post(isSave.value ? '/api/order/save' : '/api/order/update', param).then((resp) => {
let result = resp.data;
if (result.code === 200) {
+ open.value = false;
message.success(isSave.value ? formatMessage('page.add.success', '鏂板鎴愬姛') : formatMessage('page.update.success', '鏇存柊鎴愬姛'));
+ emit('tableReload', 'reload')
+ nextTick(() => {
+ formTable.value.resetFields()
+ })
} else {
message.error(result.msg);
}
- emit('tableReload', 'reload')
- nextTick(() => {
- formTable.value.resetFields()
- })
})
};
const onFinishFailed = errorInfo => {
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java
index 34a6a1e..6b96d57 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java
@@ -244,6 +244,10 @@
@ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
private String suppCode;
+ @ApiModelProperty("鏁伴噺")
+ @TableField(exist = false)
+ private Double anfme;
+
@ApiModelProperty("浣跨敤娆℃暟")
private Integer utiliz;
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
index d02c846..d2bf006 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.framework.common.R;
@@ -662,7 +663,16 @@
*/
@Override
public R getMatsByCode(String matnr) {
- return R.ok().add(matService.list(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matnr)));
+ QueryWrapper<LocDetl> wrapper = new QueryWrapper<>();
+ wrapper.eq("matnr", matnr).select("id, maktx, matnr, SUM(anfme) anfme");
+ LocDetl detl = locDetlService.getOne(wrapper);
+
+ Mat one = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, detl.getMatnr()), false);
+ if (Objects.isNull(one)) {
+ throw new CoolException("鐗╂枡涓嶅瓨鍦紒锛�");
+ }
+ one.setAnfme(detl.getAnfme());
+ return R.ok().add(one);
}
/**
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/AuthController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/AuthController.java
index 9b2fcc2..5e98f59 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/AuthController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/AuthController.java
@@ -62,9 +62,9 @@
@PostMapping("/login")
public R login(@RequestBody LoginParam param, HttpServletRequest request) {
- if (!licenseTimer.getSystemSupport()) {//璁稿彲璇佸凡澶辨晥
- return R.parse(CodeRes.SYSTEM_20001);
- }
+// if (!licenseTimer.getSystemSupport()) {//璁稿彲璇佸凡澶辨晥
+// return R.parse(CodeRes.SYSTEM_20001);
+// }
String username = param.getUsername();
Long hostId = param.getHostId();
User user = userService.getByUsername(username, hostId);
--
Gitblit v1.9.1