生产计划 销售订单推送设备信息

生产计划 销售订单推送设备信息

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorder/vo/PurchaseOrderRespVO.java

@@ -1,5 +1,6 @@
 package com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorder.vo;
 
+import com.alibaba.excel.converters.localdate.LocalDateDateConverter;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -27,8 +28,7 @@ public class PurchaseOrderRespVO {
     private String purchaseNo;
 
     @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    @ExcelProperty(value="单据日期")
-    @ExcelProperty("单据日期")
     private LocalDateTime createTime;
 
     @Schema(description = "供应商id")

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plan/PlanServiceImpl.java

@@ -16,10 +16,12 @@ import com.chanko.yunxi.mes.module.heli.dal.mysql.plansub.PlanSubMapper;
 import com.chanko.yunxi.mes.module.heli.enums.ProjectPlanStatusEnum;
 import com.chanko.yunxi.mes.module.heli.service.projectorder.ProjectOrderService;
 import com.chanko.yunxi.mes.module.heli.service.serialnumber.SerialNumberService;
+import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
+import org.thymeleaf.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
@@ -143,8 +145,20 @@ public class PlanServiceImpl implements PlanService {
                         planSubDO.setProjectPlanId(planDO.getId());
                         planSubDO.setProjectId(projectId);
                         planSubDO.setProjectSubId(item.getId());
+                        if(!StringUtils.isEmpty(item.getDeviceModel())){
+                            planSubDO.setEquipId(Long.parseLong(item.getDeviceModel()));
+                        }
+
                         planSubMapper.insert(planSubDO);
                     }
+                    else{
+                        PlanSubDO planSubDO = list.stream().filter(ps -> ps.getProjectSubId().equals(item.getId())).findFirst().get();
+                        if(!StringUtils.isEmpty(item.getDeviceModel())){
+                            planSubDO.setEquipId(Long.parseLong(item.getDeviceModel()));
+                        }
+
+                        planSubMapper.updateById(planSubDO);
+                    }
                 }
 
             }else{
@@ -171,6 +185,9 @@ public class PlanServiceImpl implements PlanService {
                     planSubDO.setProjectPlanId(planDO.getId());
                     planSubDO.setProjectId(projectId);
                     planSubDO.setProjectSubId(item.getId());
+                    if(!StringUtils.isEmpty(item.getDeviceModel())){
+                        planSubDO.setEquipId(Long.parseLong(item.getDeviceModel()));
+                    }
                     planSubMapper.insert(planSubDO);
                 }
             }

mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue

@@ -566,6 +566,16 @@ const submitForm = async () => {
   // 校验表单
   await formRef.value.validate()
   await subFormRef.value.validate()
+
+  let isRepeat= false
+  formData.value.projectPlanSubs.forEach(item => {
+    if(formData.value.projectPlanSubs.filter(record =>{ return  record.projectSubShortName == item.projectSubShortName }).length>1)
+    isRepeat = true
+  })
+  if(isRepeat){
+    await message.alert("子项目简称重复")
+    return
+  }
   // 提交请求
   formLoading.value = true
   try {

mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue

@@ -392,8 +392,7 @@ const handleEstimatedPrice = async () =>{
 
   let allEstimatePrice = 0
   formData.value.matItemDOList.forEach(item =>{
-    if(item.estimatedPrice.length>0)
+    allEstimatePrice +=item.estimatedPrice
-    allEstimatePrice +=Number(item.estimatedPrice)
   })
 
   formData.value.estimatedPrice = allEstimatePrice
@@ -402,8 +401,7 @@ const handleActualPrice = async () =>{
 
   let allActualPrice = 0
   formData.value.matItemDOList.forEach(item =>{
-    if(item.actualPrice.length>0)
+    allActualPrice +=item.actualPrice
-    allActualPrice +=Number(item.actualPrice)
   })
 
   formData.value.actualPrice = allActualPrice
@@ -551,6 +549,7 @@ const onAddItem = () => {
 const handleDelete2 = (index: number) => {
   formData.value.matItemRemoveList.push(formData.value.matItemDOList[index])
   formData.value.matItemDOList.splice(index, 1)
+  console.log(formData.value.matItemDOList)
 }
 
 // 保存物料信息