BUG修复

mes/src/main/java/com/ximai/mes/md/controller/MdWorkunitWorkerController.java

@@ -10,6 +10,7 @@ import com.ximai.common.enums.BusinessType;
 import com.ximai.common.utils.MessageUtils;
 import com.ximai.common.utils.SecurityUtils;
 import com.ximai.common.utils.data.ExceptionUtil;
+import com.ximai.common.utils.data.StringUtils;
 import com.ximai.common.utils.poi.ExcelUtil;
 import com.ximai.mes.md.domain.MdWorkunit;
 import com.ximai.mes.md.domain.MdWorkunitWorker;
@@ -73,8 +74,10 @@ public class MdWorkunitWorkerController extends BaseController {
             userId = SecurityUtils.getUserId();
         }
         QueryWrapper<MdWorkunit> query = new QueryWrapper<MdWorkunit>().eq("user_id", userId);
+        query.eq(mdWorkunit.getWorkstationId()!=null,"ws.workstation_id",mdWorkunit.getWorkstationId());
+        query.like(StringUtils.isNotNull(mdWorkunit.getWorkunitCode()),"t1.workunit_code",mdWorkunit.getWorkunitCode());
+        query.like(StringUtils.isNotNull(mdWorkunit.getWorkunitName()),"t1.workunit_name",mdWorkunit.getWorkunitName());
         List<MdWorkunitVo> list = mdWorkunitService.selectMdWorkunitListByUser(query);
-
         return getDataTable(list);
     }
 

mes/src/main/java/com/ximai/mes/md/dto/MdClientExcelImport.java

+package com.ximai.mes.md.dto;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ximai.common.annotation.Excel;
+import com.ximai.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.net.URLEncoder;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Optional;
+
+/**
+ * 客户对象 md_client
+ *
+ * @author yinjinlu
+ * @date 2024-01-19
+ */
+@Data
+public class MdClientExcelImport {
+
+    /**
+     * 客户编码
+     */
+    @ExcelProperty("客户编码")
+    private String clientCode;
+
+    /**
+     * sap客户编码
+     */
+    @ExcelProperty("sap客户编码")
+    private String sapClientCode;
+
+    /**
+     * 客户名称
+     */
+    @ExcelProperty("客户名称")
+    private String clientName;
+
+    /**
+     * 客户简称
+     */
+    @ExcelProperty("客户简称")
+    private String clientNick;
+
+    /**
+     * 客户英文名称
+     */
+    @ExcelProperty("客户英文名称")
+    private String clientEn;
+
+    /**
+     * 英文名简称
+     */
+    @ExcelProperty("英文名简称")
+    private String clientEnAbbr;
+
+    /**
+     * 客户等级
+     */
+    @ExcelProperty("客户等级")
+    private Long clientLevel;
+
+    public static void main(String[] args) throws Exception {
+        FileOutputStream response = new FileOutputStream("C:\\Users\\men_c\\Desktop\\test.xlsx");
+        String sheetName = "Sheet1";
+        EasyExcel.write(response, MdClientExcelImport.class)
+                .sheet(sheetName).doWrite(new ArrayList<>());
+        response.close();
+    }
+
+}

mes/src/main/java/com/ximai/mes/pro/domain/vo/task/ProTaskWorkunitQuery.java

@@ -8,6 +8,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -44,6 +45,9 @@ public class ProTaskWorkunitQuery extends BaseEntity {
     @ApiModelProperty("产品物料名称")
     private String itemName;
 
+    @ApiModelProperty("大于排产数量")
+    private BigDecimal gtQuantity;
+
     @ApiModelProperty("生产任务状态，UN_ASSIGN:未下达,PREPARE:未开工,BEGINNING:已开工,PAUSE:暂停,ERROR_STOP:异常停工,FINISHED:完工")
     private String[] statusArr;
 

mes/src/main/java/com/ximai/mes/pro/service/impl/task/ProTaskWorkunitServiceImpl.java

@@ -403,6 +403,7 @@ public class ProTaskWorkunitServiceImpl implements IProTaskWorkunitService {
         query.like(StringUtils.isNotEmpty(proTaskWorkunit.getTaskCode()), "t.task_code", proTaskWorkunit.getTaskCode());
         query.like(StringUtils.isNotEmpty(proTaskWorkunit.getWorkunitName()), "mw.workunit_name", proTaskWorkunit.getWorkunitName());
         query.like(StringUtils.isNotEmpty(proTaskWorkunit.getItemName()), "wo.product_name", proTaskWorkunit.getItemName());
+m        query.gt(StringUtils.isNotEmpty(proTaskWorkunit.getGtQuantity()), "ptw.quantity", proTaskWorkunit.getGtQuantity());
         query.like(StringUtils.isNotEmpty(proTaskWorkunit.getItemCode()), "wo.product_code", proTaskWorkunit.getItemCode());
         query.like(StringUtils.isNotEmpty(proTaskWorkunit.getProcessName()), "t.process_name", proTaskWorkunit.getProcessName());
         query.gt(proTaskWorkunit.getScheduleStartDateFrom() != null, "ptw.schedule_start_date", proTaskWorkunit.getScheduleStartDateFrom());
@@ -502,10 +503,6 @@ public class ProTaskWorkunitServiceImpl implements IProTaskWorkunitService {
             //原数量扣减
             taskWorkunit.setQuantity(taskWorkunit.getQuantity().subtract(toOutsourceParam.getToOutsourceQuantity()));
             this.updateProTaskWorkunit(taskWorkunit);
-            //待加工数量扣减
-            ProTask proTask = proTaskService.selectProTaskByTaskId(taskWorkunit.getTaskId());
-            proTask.setQuantityWait(NumberUtil.max(proTask.getQuantityWait().subtract(toOutsourceParam.getToOutsourceQuantity()),BigDecimal.ZERO));
-            proTaskService.updateProTask(proTask);
             //添加记录
             ProTaskWorkunitConvertRecordCreate record = new ProTaskWorkunitConvertRecordCreate();
             record.setTaskWorkunitId(taskWorkunit.getTaskWorkunitId());