From e81a3446617207688cd60fe5b1717a18c5cb9e32 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 26 五月 2025 18:14:36 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java
index f261049..963e330 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java
@@ -10,8 +10,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.entity.enums.OrderType;
-import com.vincent.rsf.server.api.entity.enums.OrderWorkType;
+import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.CommonUtil;
@@ -119,7 +119,6 @@
.setMemo(template.getMemo())
.setUpdateBy(loginUserId)
.setCreateBy(loginUserId)
- .setPoId(Long.parseLong(template.getPoId()))
.setType(OrderType.getTypeVal(template.getType()))
.setWkType(OrderWorkType.getWorkType(template.getWkType()));
if (!outStockService.save(order)) {
@@ -137,16 +136,11 @@
.setAsnCode(order.getCode())
.setSplrBatch(orderTemplate.getSplrBatch())
.setAnfme(Double.parseDouble(orderTemplate.getAnfme()))
- .setQty(Double.parseDouble(orderTemplate.getQty()))
.setSplrName(orderTemplate.getSplrName())
- .setBarcode(orderTemplate.getBarcode())
- .setTrackCode(orderTemplate.getTrackCode())
.setSplrCode(orderTemplate.getSplrCode())
.setPoCode(orderTemplate.getPoCode())
.setMaktx(orderTemplate.getMaktx())
- .setMatnrCode(orderTemplate.getMatnrCode())
- .setPurUnit(orderTemplate.getPurUnit())
- .setPurQty(Double.parseDouble(orderTemplate.getPurQty()));
+ .setMatnrCode(orderTemplate.getMatnrCode());
if (!Objects.isNull(matnr)) {
orderItem.setMaktx(matnr.getName()).setMatnrCode(matnr.getCode()).setMatnrId(matnr.getId());
}
--
Gitblit v1.9.1