From b1edf58cc1d081e5e4284b733f8169198831b875 Mon Sep 17 00:00:00 2001 From: zhaoyf <1783123481@qq.com> Date: Tue, 14 Jul 2026 15:48:54 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=8D=95=E6=8D=AE=E8=BD=AC=E5=8F=91?= =?UTF-8?q?=E4=B8=AD=E9=BC=8E=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EasToWmsController.java | 12 ++++- .../controller/param/SysParamController.java | 9 ++++ .../system_manage/enums/SysParamConstant.java | 5 ++ .../service/param/ISysParamService.java | 8 +++ .../param/impl/SysParamServiceImpl.java | 34 ++++++++++++ .../wms/pm_manage/allocationIn/index.vue | 2 +- .../src/views/wms/pm_manage/otherIn/index.vue | 2 +- .../views/wms/pm_manage/purchase/index.vue | 53 +++++++++++++++++-- .../views/wms/pm_manage/purchase/purchase.js | 17 +++++- 9 files changed, 135 insertions(+), 7 deletions(-) diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/purchase/controller/EasToWmsController.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/purchase/controller/EasToWmsController.java index 6af0b00..b295fe7 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/purchase/controller/EasToWmsController.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/purchase/controller/EasToWmsController.java @@ -1,12 +1,17 @@ package org.nl.wms.ext_manage.purchase.controller; import cn.dev33.satoken.annotation.SaIgnore; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.logging.annotation.Log; import org.nl.wms.ext_manage.purchase.service.EasToWmsService; import org.nl.wms.ext_manage.purchase.service.dto.BillChangeDto; +import org.nl.wms.ext_manage.service.WmsToZDWmdService; +import org.nl.wms.system_manage.enums.SysParamConstant; +import org.nl.wms.system_manage.service.param.ISysParamService; +import org.nl.wms.system_manage.service.param.dao.Param; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity;import org.nl.common.base.ResponseData; import org.springframework.web.bind.annotation.*; @@ -19,7 +24,8 @@ import org.springframework.web.bind.annotation.*; public class EasToWmsController { private final EasToWmsService easToWmsService; - + private final WmsToZDWmdService wmsToZDWmdService; + private final ISysParamService paramService; @PostMapping("/orderChangeNotice") @@ -27,6 +33,10 @@ public class EasToWmsController { @SaIgnore public ResponseEntity billChange(@RequestBody BillChangeDto body) { JSONObject result = easToWmsService.billChangeHandler(body); + Param forwardAllZD = paramService.findByCode(SysParamConstant.FORWARD_ALL_ZD); + if (ObjectUtil.isNotEmpty(forwardAllZD) && "1".equals(forwardAllZD.getValue())) { + wmsToZDWmdService.syncPurchaseReceiving(body); + } return ResponseData.build(result, HttpStatus.OK); } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java index c2016f2..d2eea4b 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java @@ -69,6 +69,15 @@ class SysParamController { return ResponseData.build(paramService.findByCode(code), HttpStatus.CREATED); } + @PutMapping("/updateValueByCode") + @Log("根据编码更新参数值") + public ResponseEntity updateValueByCode(@RequestBody Map body) { + String code = body.get("code"); + String value = body.get("value"); + paramService.updateValueByCode(code, value); + return ResponseData.build(); + } + } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/system_manage/enums/SysParamConstant.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/system_manage/enums/SysParamConstant.java index 367ea6e..f1c331a 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/system_manage/enums/SysParamConstant.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/system_manage/enums/SysParamConstant.java @@ -42,4 +42,9 @@ public class SysParamConstant { */ public final static String PRINTER_PORT = "printer_port"; + /** + * 单据转发中鼎开关 0-关闭 1-开启 + */ + public final static String FORWARD_ALL_ZD = "forward_all_zd"; + } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/system_manage/service/param/ISysParamService.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/system_manage/service/param/ISysParamService.java index 461787d..dd4b2ee 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/system_manage/service/param/ISysParamService.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/system_manage/service/param/ISysParamService.java @@ -56,4 +56,12 @@ public interface ISysParamService extends IService { * @return Param */ Param findByCode(String code); + + /** + * 根据编码更新参数值，不存在则创建 + * + * @param code 参数编码 + * @param value 参数值 + */ + void updateValueByCode(String code, String value); } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/system_manage/service/param/impl/SysParamServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/system_manage/service/param/impl/SysParamServiceImpl.java index 0aef89b..0bcf54d 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/system_manage/service/param/impl/SysParamServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/system_manage/service/param/impl/SysParamServiceImpl.java @@ -101,4 +101,38 @@ public class SysParamServiceImpl extends ServiceImpl impl Param param = paramMapper.selectOne(queryWrapper); return param; } + + @Override + @Transactional(rollbackFor = Exception.class) + public void updateValueByCode(String code, String value) { + Param param = findByCode(code); + if (param == null) { + param = new Param(); + param.setCode(code); + param.setName(code); + param.setZh_name(code); + param.setEn_name(code); + param.setIn_name(code); + param.setValue(value); + param.setIs_active(true); + param.setIs_delete(false); + param.setId(IdUtil.getSnowflake(1, 1).nextIdStr()); + String currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + param.setCreate_id(currentUserId); + param.setCreate_name(nickName); + param.setCreate_time(now); + param.setUpdate_id(currentUserId); + param.setUpdate_name(nickName); + param.setUpdate_time(now); + paramMapper.insert(param); + } else { + param.setValue(value); + param.setUpdate_id(SecurityUtils.getCurrentUserId()); + param.setUpdate_name(SecurityUtils.getCurrentNickName()); + param.setUpdate_time(DateUtil.now()); + paramMapper.updateById(param); + } + } } diff --git a/nladmin-ui/src/views/wms/pm_manage/allocationIn/index.vue b/nladmin-ui/src/views/wms/pm_manage/allocationIn/index.vue index 45fcc8c..839c90e 100644 --- a/nladmin-ui/src/views/wms/pm_manage/allocationIn/index.vue +++ b/nladmin-ui/src/views/wms/pm_manage/allocationIn/index.vue @@ -345,7 +345,7 @@ export default { html += '
' html += '

上海诺力

' html += '' - html += '' + html += '' html += '' html += '' html += '' diff --git a/nladmin-ui/src/views/wms/pm_manage/otherIn/index.vue b/nladmin-ui/src/views/wms/pm_manage/otherIn/index.vue index 846a258..f6a5f95 100644 --- a/nladmin-ui/src/views/wms/pm_manage/otherIn/index.vue +++ b/nladmin-ui/src/views/wms/pm_manage/otherIn/index.vue @@ -293,7 +293,7 @@ export default { html += '
' html += '

上海诺力

' html += '
订单号' + orderNo + '
单据号' + orderNo + '
行号' + itemNo + '
物料编码' + skuCode + '
物料名称' + skuName + '
' - html += '' + html += '' html += '' html += '' html += '' diff --git a/nladmin-ui/src/views/wms/pm_manage/purchase/index.vue b/nladmin-ui/src/views/wms/pm_manage/purchase/index.vue index bbcc8f5..8903d9e 100644 --- a/nladmin-ui/src/views/wms/pm_manage/purchase/index.vue +++ b/nladmin-ui/src/views/wms/pm_manage/purchase/index.vue @@ -27,8 +27,34 @@ - 下发回传单 - 打印 + 下发回传单 + + 打印 + + @@ -150,6 +176,7 @@ export default { currentRow: null, audit_flag: true, printPreviewVisible: false, + forwardAllZD: false, billStatusOptions: [ { value: '0', label: '已创建' }, { value: '1', label: '执行中' }, @@ -157,7 +184,27 @@ export default { ] } }, + mounted() { + this.loadForwardZDStatus() + }, methods: { + loadForwardZDStatus() { + crudPurchase.getForwardZDStatus().then(res => { + if (res.data && res.data.value) { + this.forwardAllZD = res.data.value === '1' + } + }).catch(() => { + this.forwardAllZD = false + }) + }, + onForwardAllZDToggle(val) { + crudPurchase.setForwardZDStatus(val ? '1' : '0').then(() => { + this.crud.notify(val ? '已开启所有单据转发中鼎' : '已关闭所有单据转发中鼎') + }).catch(() => { + this.forwardAllZD = !val + this.crud.notify('操作失败', CRUD.NOTIFICATION_TYPE.ERROR) + }) + }, canUd(row) { return row.bill_status !== '0' }, @@ -314,7 +361,7 @@ export default { html += '
' html += '

上海诺力

' html += '
订单号' + orderNo + '
单据号' + orderNo + '
行号' + itemNo + '
物料编码' + skuCode + '
物料名称' + skuName + '
' - html += '' + html += '' html += '' html += '' html += '' diff --git a/nladmin-ui/src/views/wms/pm_manage/purchase/purchase.js b/nladmin-ui/src/views/wms/pm_manage/purchase/purchase.js index 3dba01c..d8d0c25 100644 --- a/nladmin-ui/src/views/wms/pm_manage/purchase/purchase.js +++ b/nladmin-ui/src/views/wms/pm_manage/purchase/purchase.js @@ -55,4 +55,19 @@ export function pushZD(data) { }) } -export default { add, edit, del, get, issueReturnBill, print, pushZD } +export function getForwardZDStatus() { + return request({ + url: '/api/param/getValueByCode/forward_all_zd', + method: 'post' + }) +} + +export function setForwardZDStatus(value) { + return request({ + url: '/api/param/updateValueByCode', + method: 'put', + data: { code: 'forward_all_zd', value: value } + }) +} + +export default { add, edit, del, get, issueReturnBill, print, pushZD, getForwardZDStatus, setForwardZDStatus }
订单号' + orderNo + '
单据号' + orderNo + '
行号' + itemNo + '
物料编码' + skuCode + '
物料名称' + skuName + '