4.0.2

bom信息中文件格式从系统参数获取

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">

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));

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;