智能排产1

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMonthlyProductionService.java

@@ -38,4 +38,6 @@ public interface YysMonthlyProductionService extends IService<YysMonthlyProducti
     String isFrozen(String id);
 
     String cancelFrozen(String id);
+
+    List<YysMonthlyProductionEntity> getUnScheduleProduction(String month);
 }

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMonthlyProductionServiceImpl.java

@@ -375,4 +375,14 @@ public class YysMonthlyProductionServiceImpl extends ServiceImpl<YysMonthlyProdu
         this.updateById(entity);
         return "取消冻结成功";
     }
+
+    //未排产完成的
+    @Override
+    public List<YysMonthlyProductionEntity> getUnScheduleProduction(String month) {
+        QueryWrapper<YysMonthlyProductionEntity> wrapper = new QueryWrapper<>();
+        wrapper.lambda().eq(YysMonthlyProductionEntity::getYears, month)
+                .isNull(YysMonthlyProductionEntity::getDeleteMark)
+                .eq(YysMonthlyProductionEntity::getIsFrozen, "否");
+        return this.list(wrapper);
+    }
 }

jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMonthlyProductionController.java

@@ -1,59 +1,53 @@
 package jnpf.controller;
 
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import cn.hutool.core.lang.UUID;
-import cn.hutool.core.lang.generator.UUIDGenerator;
 import cn.hutool.core.util.NumberUtil;
+import cn.xuyanwu.spring.file.storage.FileInfo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jnpf.base.ActionResult;
 import jnpf.base.UserInfo;
-import jnpf.service.*;
+import jnpf.base.model.ColumnDataModel;
+import jnpf.base.util.VisualUtils;
+import jnpf.base.vo.DownloadVO;
+import jnpf.base.vo.PageListVO;
+import jnpf.base.vo.PaginationVO;
+import jnpf.config.ConfigValueUtil;
 import jnpf.entity.*;
-import jnpf.util.*;
+import jnpf.model.visualJson.config.HeaderModel;
 import jnpf.model.yysmonthlyproduction.*;
+import jnpf.onlinedev.model.ExcelImFieldModel;
+import jnpf.onlinedev.model.OnlineImport.ExcelImportModel;
+import jnpf.onlinedev.model.OnlineImport.ImportDataModel;
+import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel;
+import jnpf.onlinedev.model.OnlineImport.VisualImportModel;
+import jnpf.service.*;
+import jnpf.util.*;
+import lombok.Cleanup;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.io.File;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-
-import jnpf.base.vo.PageListVO;
-import jnpf.base.vo.PaginationVO;
-import jnpf.base.vo.DownloadVO;
-import jnpf.config.ConfigValueUtil;
-
-import java.io.IOException;
 import java.util.stream.Collectors;
 
-import org.springframework.web.multipart.MultipartFile;
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.ExcelImportUtil;
-import cn.afterturn.easypoi.excel.entity.ExportParams;
-import cn.afterturn.easypoi.excel.entity.ImportParams;
-import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
-import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Workbook;
-
-import java.io.File;
-
-import jnpf.onlinedev.model.ExcelImFieldModel;
-import jnpf.onlinedev.model.OnlineImport.ImportDataModel;
-import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel;
-import jnpf.onlinedev.model.OnlineImport.ExcelImportModel;
-import jnpf.onlinedev.model.OnlineImport.VisualImportModel;
-import cn.xuyanwu.spring.file.storage.FileInfo;
-import lombok.Cleanup;
-import jnpf.model.visualJson.config.HeaderModel;
-import jnpf.base.model.ColumnDataModel;
-import jnpf.base.util.VisualUtils;
-import org.springframework.transaction.annotation.Transactional;
-
 /**
  * yysMonthlyProduction
  *
@@ -752,9 +746,16 @@ public class YysMonthlyProductionController {
         boolean b2 = materialRequirementItemService.saveBatch(planItems);
 
         // 更新计划表中物料需求计划ID
+        unMPRList.forEach(item -> {
+            item.setIsMrp("1");
+            item.setMeasurementNumber(planNumber);
+            item.setLastModifyTime(DateUtil.getNowDate());
+            item.setLastModifyUserId(userInfo.getUserId());
+        });
+        boolean b1 = yysMonthlyProductionService.updateBatchById(unMPRList);
 
         // 完结
-        return ActionResult.success(    "计算完成！",planNumber);
+        return ActionResult.success("计算完成！", planNumber);
     }
 
     private List<YysDayWorkEntity> mergeWork(List<YysDayWorkEntity> workList) {
@@ -849,7 +850,23 @@ public class YysMonthlyProductionController {
     @Operation(summary = "生产排产")
     public ActionResult ProductionScheduling(@RequestBody YysMonthlyProductionStrategyVO strategyVO) {
 
+        String month = strategyVO.getMonth();
+        if (StringUtil.isNotEmpty(month)) {
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
+            try {
+                format.parse(month);
+            } catch (ParseException e) {
+                return ActionResult.fail("月份格式不正确");
+            }
+        } else {
+            return ActionResult.fail("月份不能为空");
+        }
         // 获取月度生产计划
+        List<YysMonthlyProductionEntity> plans = yysMonthlyProductionService.getUnScheduleProduction(month);
+        if (plans.size() == 0) {
+            return ActionResult.fail("没有未排产的计划");
+        }
+//        plans.
 
         // 根据计划生成的物料 获取BOM清单
 

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysMaterialProcurementPlanEntity.java

@@ -21,9 +21,9 @@ public class YysMaterialProcurementPlanEntity  {
     @TableField(value = "PLAN_NUMBER" , updateStrategy = FieldStrategy.IGNORED)
     private String planNumber;
     @TableField(value = "PROCUREMENT_YEAR_MONTH" , updateStrategy = FieldStrategy.IGNORED)
-    private Date procurementYearMonth;
+    private String procurementYearMonth;
     @TableField(value = "PROCUREMENT_DATE" , updateStrategy = FieldStrategy.IGNORED)
-    private Date procurementDate;
+    private String procurementDate;
     @TableField("PROCUREMENT_STATUS")
     private String procurementStatus;
     @TableField(value = "REAMRK" , updateStrategy = FieldStrategy.IGNORED)