From 3918b934caacbb2e8d748f0a8c2541f0a8dfac90 Mon Sep 17 00:00:00 2001
From: xs <xins@mesnac.com>
Date: Tue, 17 Dec 2024 14:24:36 +0800
Subject: [PATCH] =?UTF-8?q?4.0.2=20bom=E4=BF=A1=E6=81=AF=E4=B8=AD=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=A0=BC=E5=BC=8F=E4=BB=8E=E7=B3=BB=E7=BB=9F=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/mes/MesProjectInfoMapper.xml       |  1 +
 .../hw/wms/controller/WmsApiController.java   |  7 ++++-
 hw-ui/src/views/mes/materialBom/index.vue     | 30 +++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProjectInfoMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProjectInfoMapper.xml
index 2b1f96c8..bf3912b6 100644
--- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProjectInfoMapper.xml
+++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProjectInfoMapper.xml
@@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="completeDate != null "> and complete_date = #{completeDate}</if>
             <if test="isFlag != null  and isFlag != ''"> and is_flag = #{isFlag}</if>
         </where>
+        order by erp_modify_date desc
     </select>
     
     <select id="selectMesProjectInfoByProjectId" parameterType="Long" resultMap="MesProjectInfoResult">
diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsApiController.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsApiController.java
index f8d1304f..e4a26fc1 100644
--- a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsApiController.java
+++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsApiController.java
@@ -246,6 +246,7 @@ public class WmsApiController extends BaseController {
      * @return
      */
     @PostMapping(("/synchronizeInventoryInformationToERP"))
+    @Log(title = "同步原材料入库信息", businessType = BusinessType.INSERT)
     public AjaxResult synchronizeInventoryInformationToERP() {
         int result = 0;
         Map<Long, List<WmsRawInstock>> purchaseOrderIdMap = wmsErpScheduledTaskService.synchronizeInventoryInformationToERP();
@@ -261,6 +262,7 @@ public class WmsApiController extends BaseController {
      * @return
      */
     @PostMapping(("/synchronizeRawMaterialDeliveryInformationToERP"))
+    @Log(title = "同步原材料出库信息", businessType = BusinessType.INSERT)
     public AjaxResult synchronizeRawMaterialDeliveryInformationToERP() {
         Map<Long, List<WmsRawOutstockDetail>> otherMaterialIdMap = wmsErpScheduledTaskService.synchronizeOtherMaterialDeliveryInformationToERP();
         for (Long materialId : otherMaterialIdMap.keySet()) {
@@ -282,6 +284,7 @@ public class WmsApiController extends BaseController {
      * @return
      */
     @PostMapping(("/synchronizeRawReturnInformationToERP"))
+    @Log(title = "同步原材料退库信息", businessType = BusinessType.INSERT)
     public AjaxResult synchronizeRawReturnInformationToERP() {
         Map<Long, List<WmsRawReturnDetail>> purchaseOrderIdMap = wmsErpScheduledTaskService.synchronizeRawReturnInformationToERP();
         int result= 0;
@@ -298,6 +301,7 @@ public class WmsApiController extends BaseController {
      * @return
      */
     @PostMapping(("/synchronizeProductInstockInformationToERP/{days}"))
+    @Log(title = "同步成品入库信息", businessType = BusinessType.INSERT)
     public AjaxResult synchronizeProductInstockInformationToERP(@PathVariable Integer days) {
         Map<Long, List<WmsProductInstock>> productIdMap = wmsErpScheduledTaskService.synchronizeProductInstockInformationToERP(days);
         int result = 0;
@@ -314,6 +318,7 @@ public class WmsApiController extends BaseController {
      * @return
      */
     @PostMapping(("/synchronizeProductOutstockInformationToERP/{days}"))
+    @Log(title = "同步成品出库信息", businessType = BusinessType.INSERT)
     public AjaxResult synchronizeProductOutstockInformationToERP(@PathVariable Integer days) {
         Map<Long, List<WmsProductOutstock>> productIdMap = wmsErpScheduledTaskService.synchronizeProductOutstockInformationToERP(days);
         int result = 0;
@@ -327,7 +332,7 @@ public class WmsApiController extends BaseController {
     /**
      * WCS调度接口-通知调度继续任务（在4楼到5楼接驳位时调用调度继续任务）
      */
-    @Log(title = "入库", businessType = BusinessType.CONTINUE)
+    @Log(title = "调度入库", businessType = BusinessType.CONTINUE)
     @PostMapping(("/continueRawInstock"))
     public AjaxResult continueRawInstock(@Validated @RequestBody WmsRawInstockContinueVo wmsRawInstockContinueVo) {
         return toAjax(wmsRawInstockService.continueRawInstock(wmsRawInstockContinueVo));
diff --git a/hw-ui/src/views/mes/materialBom/index.vue b/hw-ui/src/views/mes/materialBom/index.vue
index 2e097802..e5446e6f 100644
--- a/hw-ui/src/views/mes/materialBom/index.vue
+++ b/hw-ui/src/views/mes/materialBom/index.vue
@@ -473,6 +473,7 @@ import {getToken} from "@/utils/auth";
 import {getDispatchDrawingList, getDispatchSOPAttachList, uploadFile} from "@/api/mes/productplan";
 import {selectByAttachIds} from "@/api/mes/baseAttachInfo";
 import {findUserList} from "@/api/system/user";
+import {getConfigKey} from "@/api/system/config";
 
 export default {
   name: "MaterialBom",
@@ -645,8 +646,37 @@ export default {
   },
   created() {
     this.getList();
+    this.getConfigValues();
   },
   methods: {
+    getConfigValues(){
+      //图纸支持格式
+      getConfigKey("mes.drawing.allowedExtension").then(res => {
+        if(res.msg){
+          this.drawingFileType = res.msg.split(",");
+        }
+      });
+
+      getConfigKey("mes.drawing.maxSize").then(res => {
+        if(res.msg){
+          this.drawingFileSize = res.msg;
+        }
+      });
+
+      getConfigKey("mes.sop.allowedExtension").then(res => {
+        if(res.msg){
+          this.sopFileType = res.msg.split(",");
+        }
+      });
+
+      getConfigKey("mes.sop.maxSize").then(res => {
+        if (res.msg) {
+          this.sopFileSize = res.msg;
+        }
+      });
+
+    },
+
     /** 查询物料BOM信息列表 */
     getList() {
       this.loading = true;