From 22bd790f3d89249a39d0cabdf4a009cc8c2bfcd4 Mon Sep 17 00:00:00 2001
From: 10001392 <1055202292@qq.com>
Date: Tue, 8 Oct 2024 17:05:57 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=89=A9=E6=96=99=E4=B8=BB=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E3=80=91=201=E3=80=81=E7=89=A9=E6=96=99=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E8=AF=A6=E6=83=85=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8E=9F?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=202?=
 =?UTF-8?q?=E3=80=81hana=E6=9C=80=E8=BF=91=E9=87=87=E8=B4=AD=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E5=85=AC=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/material/pojo/vo/MaterialMainVO.java | 11 +++++++++++
 .../product/material/service/MaterialMainService.java |  2 +-
 .../material/service/MaterialUpdateBillService.java   |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialMainVO.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialMainVO.java
index b7d8aecf..0c8ffbf9 100644
--- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialMainVO.java
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialMainVO.java
@@ -473,5 +473,16 @@ public class MaterialMainVO implements Serializable {
     @ApiModelProperty(value = "变更生效时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateEffectTime;
+
+    /**
+     * 旧物料状态 1:正常   2:禁止采购 3:售后专用  4:冻结  5:完全弃用
+     */
+    @ApiModelProperty(value = "旧物料状态 1:正常(激活)   2:禁止采购 3:售后专用  4:禁用(冻结)  5:完全弃用")
+    @ExcelColumn("旧物料状态 1:禁用 0：启用")
+    private Integer oldMaterialState;
+
+    @ApiModelProperty(value = "旧物料状态名称")
+    @ExcelColumn("旧物料状态名称")
+    private Integer oldMaterialStateName;
     // 变更弹窗字段 end
 }
diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java
index 72c0b24b..9cd8b8a0 100644
--- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java
@@ -1914,7 +1914,7 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
         sql2 = sql2.concat("( select matnr, max(BEDAT) maxBEDAT  from SAPABAP1.\"/BIC/AZSD_E00042\" where 1=1 and matnr in (").concat(whrMaterials).concat(")").concat(" and BSART = 'NB' ");
         sql2 = sql2.concat("group by matnr ) a");
         sql2 = sql2.concat(" left join");
-        sql2 = sql2.concat(" ( select matnr, BEDAT,BRTWR,MENGE,PEINH ,  case when MENGE = 0 or PEINH = 0 then 0 else BRTWR/(MENGE*PEINH) end  as purPrice  from SAPABAP1.\"/BIC/AZSD_E00042\"  where 1=1 and matnr in (").concat(whrMaterials).concat(") and BSART = 'NB' )b");
+        sql2 = sql2.concat(" ( select matnr, BEDAT,BRTWR,MENGE,PEINH ,  case when MENGE = 0 or PEINH = 0 then 0 else BRTWR/MENGE end  as purPrice  from SAPABAP1.\"/BIC/AZSD_E00042\"  where 1=1 and matnr in (").concat(whrMaterials).concat(") and BSART = 'NB' )b");
         sql2 = sql2.concat(" on a.matnr = b.matnr  and   a.maxBEDAT = b.BEDAT");
 
         log.info("获取SAP最近采购价格");
diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateBillService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateBillService.java
index cb49d8fd..d8b1b9ca 100644
--- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateBillService.java
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateBillService.java
@@ -1057,6 +1057,7 @@ public class MaterialUpdateBillService extends ServiceImpl<MaterialUpdateBillMap
                 materialMainVO.setOutAttrs(outAttrs);
             }
             materialMainVO.setMaterialState(materialUpdateBillEntity.getNewMaterialState());
+            materialMainVO.setOldMaterialState(materialUpdateBillEntity.getOldMaterialState());
             if (StringUtils.isEmpty(materialUpdateBillEntity.getUpdateResion())) {
                 materialMainVO.setUpdateResion("");
             } else {