diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMonthlyProductionController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMonthlyProductionController.java index 4b80870..38449da 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMonthlyProductionController.java +++ b/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 mergeWork(List workList) {