aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java
@@ -1,48 +1,45 @@ package com.aps.core.controller; import java.util.List; import java.io.IOException; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.aps.common.core.utils.poi.ExcelUtil; import com.aps.common.core.utils.uuid.IdUtils; import com.aps.common.core.web.controller.BaseController; import com.aps.common.core.web.domain.AjaxResult; import com.aps.common.core.web.page.TableDataInfo; import com.aps.common.log.annotation.Log; import com.aps.common.log.enums.BusinessType; import com.aps.common.security.annotation.RequiresPermissions; import com.aps.common.security.utils.DictUtils; import com.aps.core.domain.ApsPartPlan; import com.aps.core.domain.ApsPartPlanTemp; import com.aps.core.service.IApsPartPlanService; import com.aps.common.core.web.controller.BaseController; import com.aps.common.core.web.domain.AjaxResult; import com.aps.common.core.utils.poi.ExcelUtil; import com.aps.common.core.web.page.TableDataInfo; import com.aps.core.service.IApsPartPlanTempService; import com.aps.system.api.domain.SysDictData; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.util.List; /** * é¶ä»¶è®¡å管çController * * * @author wwj * @date 2025-04-08 */ @RestController @RequestMapping("/partPlan") public class ApsPartPlanController extends BaseController { public class ApsPartPlanController extends BaseController { @Autowired private IApsPartPlanService apsPartPlanService; @Autowired private IApsPartPlanTempService apsPartPlanTempService; /** * æ¥è¯¢é¶ä»¶è®¡å管çå表 */ @RequiresPermissions("partPlan:list") @GetMapping("/list") public TableDataInfo list(ApsPartPlan apsPartPlan) { public TableDataInfo list(ApsPartPlan apsPartPlan) { startPage(); List<ApsPartPlan> list = apsPartPlanService.selectApsPartPlanList(apsPartPlan); return getDataTable(list); @@ -54,11 +51,19 @@ @RequiresPermissions("partPlan:export") @Log(title = "é¶ä»¶è®¡å管ç", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, ApsPartPlan apsPartPlan) { List<ApsPartPlan> list = apsPartPlanService.selectApsPartPlanList(apsPartPlan); public void export(HttpServletResponse response, ApsPartPlan apsPartPlan) { List<ApsPartPlan> apsPartPlans = apsPartPlanService.selectApsPartPlanList(apsPartPlan); List<SysDictData> list = DictUtils.getDictCache("aps_is_suspended"); for (int i = 0; i < apsPartPlans.size(); i++) { for (int j = 0; j < list.size(); j++) { if (apsPartPlans.get(i).getIsSuspended().equals(Integer.parseInt(list.get(j).getDictValue()))) { apsPartPlans.get(i).setIsSuspendedTxt(list.get(j).getDictLabel()); break; } } } ExcelUtil<ApsPartPlan> util = new ExcelUtil<ApsPartPlan>(ApsPartPlan.class); util.exportExcel(response, list, "é¶ä»¶è®¡åç®¡çæ°æ®"); util.exportExcel(response, apsPartPlans, "é¶ä»¶è®¡åç®¡çæ°æ®"); } /** @@ -66,8 +71,7 @@ */ @RequiresPermissions("partPlan:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { public AjaxResult getInfo(@PathVariable("id") String id) { return success(apsPartPlanService.selectApsPartPlanById(id)); } @@ -77,8 +81,7 @@ @RequiresPermissions("partPlan:add") @Log(title = "é¶ä»¶è®¡å管ç", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody ApsPartPlan apsPartPlan) { public AjaxResult add(@RequestBody ApsPartPlan apsPartPlan) { return toAjax(apsPartPlanService.insertApsPartPlan(apsPartPlan)); } @@ -88,8 +91,7 @@ @RequiresPermissions("partPlan:edit") @Log(title = "é¶ä»¶è®¡å管ç", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody ApsPartPlan apsPartPlan) { public AjaxResult edit(@RequestBody ApsPartPlan apsPartPlan) { return toAjax(apsPartPlanService.updateApsPartPlan(apsPartPlan)); } @@ -98,9 +100,35 @@ */ @RequiresPermissions("partPlan:remove") @Log(title = "é¶ä»¶è®¡å管ç", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable String[] ids) { @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable String[] ids) { return toAjax(apsPartPlanService.deleteApsPartPlanByIds(ids)); } /** * é¶ä»¶è®¡åå¯¼å ¥ */ @PostMapping("/importData") public AjaxResult importData(MultipartFile file) throws Exception { ExcelUtil<ApsPartPlanTemp> util = new ExcelUtil<ApsPartPlanTemp>(ApsPartPlanTemp.class); List<ApsPartPlanTemp> apsPartPlans = util.importExcel(file.getInputStream()); if (apsPartPlans.size() > 0) { String batchNum= IdUtils.fastUUID(); List<SysDictData> list = DictUtils.getDictCache("aps_is_suspended"); for (int i = 0; i < apsPartPlans.size(); i++) { for (int j = 0; j < list.size(); j++) { if (apsPartPlans.get(i).getIsSuspendedTxt().equals(list.get(j).getDictLabel())) { apsPartPlans.get(i).setIsSuspended(Integer.parseInt(list.get(j).getDictValue())); break; } } apsPartPlans.get(i).setBatchNumber(batchNum); apsPartPlanTempService.insertApsPartPlanTemp(apsPartPlans.get(i)); } return AjaxResult.success(batchNum); } else { return AjaxResult.error("模æ¿å 容为空"); } } } aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanTempController.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,106 @@ package com.aps.core.controller; import java.util.List; import java.io.IOException; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.aps.common.log.annotation.Log; import com.aps.common.log.enums.BusinessType; import com.aps.common.security.annotation.RequiresPermissions; import com.aps.core.domain.ApsPartPlanTemp; import com.aps.core.service.IApsPartPlanTempService; import com.aps.common.core.web.controller.BaseController; import com.aps.common.core.web.domain.AjaxResult; import com.aps.common.core.utils.poi.ExcelUtil; import com.aps.common.core.web.page.TableDataInfo; /** * é¶ä»¶è®¡å管ç临æ¶Controller * * @author wwj * @date 2025-04-08 */ @RestController @RequestMapping("/partPlanTemp") public class ApsPartPlanTempController extends BaseController { @Autowired private IApsPartPlanTempService apsPartPlanTempService; /** * æ¥è¯¢é¶ä»¶è®¡å管ç临æ¶å表 */ @RequiresPermissions("partPlanTemp:partPlanTemp:list") @GetMapping("/list") public TableDataInfo list(ApsPartPlanTemp apsPartPlanTemp) { // startPage(); List<ApsPartPlanTemp> list = apsPartPlanTempService.selectApsPartPlanTempList(apsPartPlanTemp); return getDataTable(list); } /** * 导åºé¶ä»¶è®¡å管ç临æ¶å表 */ @RequiresPermissions("partPlanTemp:partPlanTemp:export") @Log(title = "é¶ä»¶è®¡å管ç临æ¶", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, ApsPartPlanTemp apsPartPlanTemp) { List<ApsPartPlanTemp> list = apsPartPlanTempService.selectApsPartPlanTempList(apsPartPlanTemp); ExcelUtil<ApsPartPlanTemp> util = new ExcelUtil<ApsPartPlanTemp>(ApsPartPlanTemp.class); util.exportExcel(response, list, "é¶ä»¶è®¡å管çä¸´æ¶æ°æ®"); } /** * è·åé¶ä»¶è®¡å管ç临æ¶è¯¦ç»ä¿¡æ¯ */ @RequiresPermissions("partPlanTemp:partPlanTemp:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { return success(apsPartPlanTempService.selectApsPartPlanTempById(id)); } /** * æ°å¢é¶ä»¶è®¡å管çä¸´æ¶ */ @RequiresPermissions("partPlanTemp:partPlanTemp:add") @Log(title = "é¶ä»¶è®¡å管ç临æ¶", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody ApsPartPlanTemp apsPartPlanTemp) { return toAjax(apsPartPlanTempService.insertApsPartPlanTemp(apsPartPlanTemp)); } /** * ä¿®æ¹é¶ä»¶è®¡å管çä¸´æ¶ */ @RequiresPermissions("partPlanTemp:partPlanTemp:edit") @Log(title = "é¶ä»¶è®¡å管ç临æ¶", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody ApsPartPlanTemp apsPartPlanTemp) { return toAjax(apsPartPlanTempService.updateApsPartPlanTemp(apsPartPlanTemp)); } /** * å é¤é¶ä»¶è®¡å管çä¸´æ¶ */ @RequiresPermissions("partPlanTemp:partPlanTemp:remove") @Log(title = "é¶ä»¶è®¡å管ç临æ¶", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable String[] ids) { return toAjax(apsPartPlanTempService.deleteApsPartPlanTempByIds(ids)); } } aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java
@@ -1,11 +1,17 @@ package com.aps.core.domain; import java.util.Date; import com.aps.common.core.utils.uuid.IdUtils; import com.aps.common.core.utils.uuid.UUID; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.aps.common.core.annotation.Excel; import com.aps.common.core.web.domain.BaseEntity; import org.springframework.data.annotation.Id; import javax.annotation.processing.Generated; /** * é¶ä»¶è®¡å管ç对象 aps_part_plan @@ -19,14 +25,13 @@ /** 主é®id */ private String id; /** 主计åå */ @Excel(name = "主计åå") @Excel(name = "主计å") private String masterPlanner; /** 卿¥ */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "卿¥", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "卿¥", width = 30, dateFormat = "MM-dd") private Date weekDay; /** å¨åº¦ */ @@ -120,12 +125,14 @@ private String nextProcessDeparment; /** æ¯å¦æèµ· */ @Excel(name = "æ¯å¦æèµ·") // @Excel(name = "æ¯å¦æèµ·") private Integer isSuspended; /** æ¯å¦æèµ· */ @Excel(name = "æ¯å¦æèµ·") private String isSuspendedTxt; /** å¤åæ è¯ */ @Excel(name = "å¤åæ è¯") private Integer isOutsourcing; private String isOutsourcing; /** è´¦å¥ */ @Excel(name = "è´¦å¥") @@ -420,12 +427,12 @@ return isSuspended; } public void setIsOutsourcing(Integer isOutsourcing) public void setIsOutsourcing(String isOutsourcing) { this.isOutsourcing = isOutsourcing; } public Integer getIsOutsourcing() public String getIsOutsourcing() { return isOutsourcing; } @@ -550,4 +557,12 @@ .append("hasRisk", getHasRisk()) .toString(); } public String getIsSuspendedTxt() { return isSuspendedTxt; } public void setIsSuspendedTxt(String isSuspendedTxt) { this.isSuspendedTxt = isSuspendedTxt; } } aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlanTemp.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,578 @@ package com.aps.core.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.aps.common.core.annotation.Excel; import com.aps.common.core.web.domain.BaseEntity; /** * é¶ä»¶è®¡å管ç临æ¶å¯¹è±¡ aps_part_plan_temp * * @author wwj * @date 2025-04-08 */ public class ApsPartPlanTemp extends BaseEntity { private static final long serialVersionUID = 1L; /** 主é®id */ private String id; /** 主计åå */ @Excel(name = "主计åå") private String masterPlanner; /** 卿¥ */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "卿¥", width = 30, dateFormat = "MM-dd") private Date weekDay; /** å¨åº¦ */ @Excel(name = "å¨åº¦") private String weekCycle; /** 主件æå· */ @Excel(name = "主件æå·") private String mainPartNumber; /** 主件å¾å· */ @Excel(name = "主件å¾å·") private String mainPartDrawingNumber; /** 客æ·åç§° */ @Excel(name = "客æ·åç§°") private String customer; /** ä¸å¡ç±»å */ @Excel(name = "ä¸å¡ç±»å") private String businessType; /** åæ®å· */ @Excel(name = "åæ®å·") private String documentNumber; /** éæ±åç±» */ @Excel(name = "éæ±åç±»") private String requirementType; /** åæ®ç¶æ */ @Excel(name = "åæ®ç¶æ") private String documentStatus; /** æå· */ @Excel(name = "æå·") private String itemNumber; /** å¾å· */ @Excel(name = "å¾å·") private String drawingNo; /** çæ¬å· */ @Excel(name = "çæ¬å·") private String versionNumber; /** ç产æ°é */ @Excel(name = "ç产æ°é") private Long productionQuantity; /** è¯åæ°é */ @Excel(name = "è¯åæ°é") private Long goodProductsQuantity; /** å·¥åºå· */ @Excel(name = "å·¥åºå·") private String processNumber; /** å·¥ä½ä¸å¿ */ @Excel(name = "å·¥ä½ä¸å¿") private String workCenter; /** æå±é¨é¨ */ @Excel(name = "æå±é¨é¨") private String department; /** 计åå¼å·¥æ¥ */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "计åå¼å·¥æ¥", width = 30, dateFormat = "yyyy-MM-dd") private Date planStartDay; /** 计åå®å·¥æ¥ */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "计åå®å·¥æ¥", width = 30, dateFormat = "yyyy-MM-dd") private Date planEndDay; /** 夿æå· */ @Excel(name = "夿æå·") private String standbyNumber; /** 夿åç§° */ @Excel(name = "夿åç§°") private String standbyName; /** 夿åºå */ @Excel(name = "夿åºå") private Long standbyStock; /** ä¸éå·¥åºæå±é¨é¨ */ @Excel(name = "ä¸éå·¥åºæå±é¨é¨") private String nextProcessDeparment; /** æ¯å¦æèµ· */ // @Excel(name = "æ¯å¦æèµ·") private Integer isSuspended; /** æ¯å¦æèµ· */ @Excel(name = "æ¯å¦æèµ·") private String isSuspendedTxt; /** å¤åæ è¯ */ @Excel(name = "å¤åæ è¯") private String isOutsourcing; /** è´¦å¥ */ @Excel(name = "è´¦å¥") private String account; /** ä¸é¶ç©æ */ @Excel(name = "ä¸é¶ç©æ") private String advancedMaterials; /** ä¸é¶åæ®å· */ @Excel(name = "ä¸é¶åæ®å·") private String advancedDocumentNumber; /** ä¸é¶éæ±æ¥æ */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "ä¸é¶éæ±æ¥æ", width = 30, dateFormat = "yyyy-MM-dd") private Date advancedRequirementDay; /** 计åé½å¥ */ @Excel(name = "计åé½å¥") private Integer isPlanComplete; /** åºåé½å¥ */ @Excel(name = "åºåé½å¥") private Integer isStockComplete; /** æ¯å¦ææè¿å·¥åº */ @Excel(name = "æ¯å¦ææè¿å·¥åº") private Integer hasTurnback; /** é£é©æ è¯ */ @Excel(name = "é£é©æ è¯") private Integer hasRisk; /** æ¹æ¬¡å· */ @Excel(name = "æ¹æ¬¡å·") private String batchNumber; public void setId(String id) { this.id = id; } public String getId() { return id; } public void setMasterPlanner(String masterPlanner) { this.masterPlanner = masterPlanner; } public String getMasterPlanner() { return masterPlanner; } public void setWeekDay(Date weekDay) { this.weekDay = weekDay; } public Date getWeekDay() { return weekDay; } public void setWeekCycle(String weekCycle) { this.weekCycle = weekCycle; } public String getWeekCycle() { return weekCycle; } public void setMainPartNumber(String mainPartNumber) { this.mainPartNumber = mainPartNumber; } public String getMainPartNumber() { return mainPartNumber; } public void setMainPartDrawingNumber(String mainPartDrawingNumber) { this.mainPartDrawingNumber = mainPartDrawingNumber; } public String getMainPartDrawingNumber() { return mainPartDrawingNumber; } public void setCustomer(String customer) { this.customer = customer; } public String getCustomer() { return customer; } public void setBusinessType(String businessType) { this.businessType = businessType; } public String getBusinessType() { return businessType; } public void setDocumentNumber(String documentNumber) { this.documentNumber = documentNumber; } public String getDocumentNumber() { return documentNumber; } public void setRequirementType(String requirementType) { this.requirementType = requirementType; } public String getRequirementType() { return requirementType; } public void setDocumentStatus(String documentStatus) { this.documentStatus = documentStatus; } public String getDocumentStatus() { return documentStatus; } public void setItemNumber(String itemNumber) { this.itemNumber = itemNumber; } public String getItemNumber() { return itemNumber; } public void setDrawingNo(String drawingNo) { this.drawingNo = drawingNo; } public String getDrawingNo() { return drawingNo; } public void setVersionNumber(String versionNumber) { this.versionNumber = versionNumber; } public String getVersionNumber() { return versionNumber; } public void setProductionQuantity(Long productionQuantity) { this.productionQuantity = productionQuantity; } public Long getProductionQuantity() { return productionQuantity; } public void setGoodProductsQuantity(Long goodProductsQuantity) { this.goodProductsQuantity = goodProductsQuantity; } public Long getGoodProductsQuantity() { return goodProductsQuantity; } public void setProcessNumber(String processNumber) { this.processNumber = processNumber; } public String getProcessNumber() { return processNumber; } public void setWorkCenter(String workCenter) { this.workCenter = workCenter; } public String getWorkCenter() { return workCenter; } public void setDepartment(String department) { this.department = department; } public String getDepartment() { return department; } public void setPlanStartDay(Date planStartDay) { this.planStartDay = planStartDay; } public Date getPlanStartDay() { return planStartDay; } public void setPlanEndDay(Date planEndDay) { this.planEndDay = planEndDay; } public Date getPlanEndDay() { return planEndDay; } public void setStandbyNumber(String standbyNumber) { this.standbyNumber = standbyNumber; } public String getStandbyNumber() { return standbyNumber; } public void setStandbyName(String standbyName) { this.standbyName = standbyName; } public String getStandbyName() { return standbyName; } public void setStandbyStock(Long standbyStock) { this.standbyStock = standbyStock; } public Long getStandbyStock() { return standbyStock; } public void setNextProcessDeparment(String nextProcessDeparment) { this.nextProcessDeparment = nextProcessDeparment; } public String getNextProcessDeparment() { return nextProcessDeparment; } public void setIsSuspended(Integer isSuspended) { this.isSuspended = isSuspended; } public Integer getIsSuspended() { return isSuspended; } public void setIsOutsourcing(String isOutsourcing) { this.isOutsourcing = isOutsourcing; } public String getIsOutsourcing() { return isOutsourcing; } public void setAccount(String account) { this.account = account; } public String getAccount() { return account; } public void setAdvancedMaterials(String advancedMaterials) { this.advancedMaterials = advancedMaterials; } public String getAdvancedMaterials() { return advancedMaterials; } public void setAdvancedDocumentNumber(String advancedDocumentNumber) { this.advancedDocumentNumber = advancedDocumentNumber; } public String getAdvancedDocumentNumber() { return advancedDocumentNumber; } public void setAdvancedRequirementDay(Date advancedRequirementDay) { this.advancedRequirementDay = advancedRequirementDay; } public Date getAdvancedRequirementDay() { return advancedRequirementDay; } public void setIsPlanComplete(Integer isPlanComplete) { this.isPlanComplete = isPlanComplete; } public Integer getIsPlanComplete() { return isPlanComplete; } public void setIsStockComplete(Integer isStockComplete) { this.isStockComplete = isStockComplete; } public Integer getIsStockComplete() { return isStockComplete; } public void setHasTurnback(Integer hasTurnback) { this.hasTurnback = hasTurnback; } public Integer getHasTurnback() { return hasTurnback; } public void setHasRisk(Integer hasRisk) { this.hasRisk = hasRisk; } public Integer getHasRisk() { return hasRisk; } public void setBatchNumber(String batchNumber) { this.batchNumber = batchNumber; } public String getBatchNumber() { return batchNumber; } @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("id", getId()) .append("masterPlanner", getMasterPlanner()) .append("weekDay", getWeekDay()) .append("weekCycle", getWeekCycle()) .append("mainPartNumber", getMainPartNumber()) .append("mainPartDrawingNumber", getMainPartDrawingNumber()) .append("customer", getCustomer()) .append("businessType", getBusinessType()) .append("documentNumber", getDocumentNumber()) .append("requirementType", getRequirementType()) .append("documentStatus", getDocumentStatus()) .append("itemNumber", getItemNumber()) .append("drawingNo", getDrawingNo()) .append("versionNumber", getVersionNumber()) .append("productionQuantity", getProductionQuantity()) .append("goodProductsQuantity", getGoodProductsQuantity()) .append("processNumber", getProcessNumber()) .append("workCenter", getWorkCenter()) .append("department", getDepartment()) .append("planStartDay", getPlanStartDay()) .append("planEndDay", getPlanEndDay()) .append("standbyNumber", getStandbyNumber()) .append("standbyName", getStandbyName()) .append("standbyStock", getStandbyStock()) .append("nextProcessDeparment", getNextProcessDeparment()) .append("isSuspended", getIsSuspended()) .append("isOutsourcing", getIsOutsourcing()) .append("account", getAccount()) .append("advancedMaterials", getAdvancedMaterials()) .append("advancedDocumentNumber", getAdvancedDocumentNumber()) .append("advancedRequirementDay", getAdvancedRequirementDay()) .append("isPlanComplete", getIsPlanComplete()) .append("isStockComplete", getIsStockComplete()) .append("hasTurnback", getHasTurnback()) .append("hasRisk", getHasRisk()) .append("batchNumber", getBatchNumber()) .toString(); } public String getIsSuspendedTxt() { return isSuspendedTxt; } public void setIsSuspendedTxt(String isSuspendedTxt) { this.isSuspendedTxt = isSuspendedTxt; } } aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPartPlanTempMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,61 @@ package com.aps.core.mapper; import java.util.List; import com.aps.core.domain.ApsPartPlanTemp; /** * é¶ä»¶è®¡å管ç临æ¶Mapperæ¥å£ * * @author wwj * @date 2025-04-08 */ public interface ApsPartPlanTempMapper { /** * æ¥è¯¢é¶ä»¶è®¡å管çä¸´æ¶ * * @param id é¶ä»¶è®¡å管ç临æ¶ä¸»é® * @return é¶ä»¶è®¡å管çä¸´æ¶ */ public ApsPartPlanTemp selectApsPartPlanTempById(String id); /** * æ¥è¯¢é¶ä»¶è®¡å管ç临æ¶å表 * * @param apsPartPlanTemp é¶ä»¶è®¡å管çä¸´æ¶ * @return é¶ä»¶è®¡å管ç临æ¶éå */ public List<ApsPartPlanTemp> selectApsPartPlanTempList(ApsPartPlanTemp apsPartPlanTemp); /** * æ°å¢é¶ä»¶è®¡å管çä¸´æ¶ * * @param apsPartPlanTemp é¶ä»¶è®¡å管çä¸´æ¶ * @return ç»æ */ public int insertApsPartPlanTemp(ApsPartPlanTemp apsPartPlanTemp); /** * ä¿®æ¹é¶ä»¶è®¡å管çä¸´æ¶ * * @param apsPartPlanTemp é¶ä»¶è®¡å管çä¸´æ¶ * @return ç»æ */ public int updateApsPartPlanTemp(ApsPartPlanTemp apsPartPlanTemp); /** * å é¤é¶ä»¶è®¡å管çä¸´æ¶ * * @param id é¶ä»¶è®¡å管ç临æ¶ä¸»é® * @return ç»æ */ public int deleteApsPartPlanTempById(String id); /** * æ¹éå é¤é¶ä»¶è®¡å管çä¸´æ¶ * * @param ids éè¦å é¤çæ°æ®ä¸»é®éå * @return ç»æ */ public int deleteApsPartPlanTempByIds(String[] ids); } aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPartPlanTempService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,61 @@ package com.aps.core.service; import java.util.List; import com.aps.core.domain.ApsPartPlanTemp; /** * é¶ä»¶è®¡å管ç临æ¶Serviceæ¥å£ * * @author wwj * @date 2025-04-08 */ public interface IApsPartPlanTempService { /** * æ¥è¯¢é¶ä»¶è®¡å管çä¸´æ¶ * * @param id é¶ä»¶è®¡å管ç临æ¶ä¸»é® * @return é¶ä»¶è®¡å管çä¸´æ¶ */ public ApsPartPlanTemp selectApsPartPlanTempById(String id); /** * æ¥è¯¢é¶ä»¶è®¡å管ç临æ¶å表 * * @param apsPartPlanTemp é¶ä»¶è®¡å管çä¸´æ¶ * @return é¶ä»¶è®¡å管ç临æ¶éå */ public List<ApsPartPlanTemp> selectApsPartPlanTempList(ApsPartPlanTemp apsPartPlanTemp); /** * æ°å¢é¶ä»¶è®¡å管çä¸´æ¶ * * @param apsPartPlanTemp é¶ä»¶è®¡å管çä¸´æ¶ * @return ç»æ */ public int insertApsPartPlanTemp(ApsPartPlanTemp apsPartPlanTemp); /** * ä¿®æ¹é¶ä»¶è®¡å管çä¸´æ¶ * * @param apsPartPlanTemp é¶ä»¶è®¡å管çä¸´æ¶ * @return ç»æ */ public int updateApsPartPlanTemp(ApsPartPlanTemp apsPartPlanTemp); /** * æ¹éå é¤é¶ä»¶è®¡å管çä¸´æ¶ * * @param ids éè¦å é¤çé¶ä»¶è®¡å管ç临æ¶ä¸»é®éå * @return ç»æ */ public int deleteApsPartPlanTempByIds(String[] ids); /** * å é¤é¶ä»¶è®¡å管ç临æ¶ä¿¡æ¯ * * @param id é¶ä»¶è®¡å管ç临æ¶ä¸»é® * @return ç»æ */ public int deleteApsPartPlanTempById(String id); } aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanServiceImpl.java
@@ -1,6 +1,8 @@ package com.aps.core.service.impl; import java.util.List; import com.aps.common.core.utils.uuid.IdUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.aps.core.mapper.ApsPartPlanMapper; @@ -52,6 +54,7 @@ @Override public int insertApsPartPlan(ApsPartPlan apsPartPlan) { apsPartPlan.setId(IdUtils.fastUUID()); return apsPartPlanMapper.insertApsPartPlan(apsPartPlan); } aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanTempServiceImpl.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,93 @@ package com.aps.core.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.aps.core.mapper.ApsPartPlanTempMapper; import com.aps.core.domain.ApsPartPlanTemp; import com.aps.core.service.IApsPartPlanTempService; /** * é¶ä»¶è®¡å管ç临æ¶Serviceä¸å¡å±å¤ç * * @author wwj * @date 2025-04-08 */ @Service public class ApsPartPlanTempServiceImpl implements IApsPartPlanTempService { @Autowired private ApsPartPlanTempMapper apsPartPlanTempMapper; /** * æ¥è¯¢é¶ä»¶è®¡å管çä¸´æ¶ * * @param id é¶ä»¶è®¡å管ç临æ¶ä¸»é® * @return é¶ä»¶è®¡å管çä¸´æ¶ */ @Override public ApsPartPlanTemp selectApsPartPlanTempById(String id) { return apsPartPlanTempMapper.selectApsPartPlanTempById(id); } /** * æ¥è¯¢é¶ä»¶è®¡å管ç临æ¶å表 * * @param apsPartPlanTemp é¶ä»¶è®¡å管çä¸´æ¶ * @return é¶ä»¶è®¡å管çä¸´æ¶ */ @Override public List<ApsPartPlanTemp> selectApsPartPlanTempList(ApsPartPlanTemp apsPartPlanTemp) { return apsPartPlanTempMapper.selectApsPartPlanTempList(apsPartPlanTemp); } /** * æ°å¢é¶ä»¶è®¡å管çä¸´æ¶ * * @param apsPartPlanTemp é¶ä»¶è®¡å管çä¸´æ¶ * @return ç»æ */ @Override public int insertApsPartPlanTemp(ApsPartPlanTemp apsPartPlanTemp) { return apsPartPlanTempMapper.insertApsPartPlanTemp(apsPartPlanTemp); } /** * ä¿®æ¹é¶ä»¶è®¡å管çä¸´æ¶ * * @param apsPartPlanTemp é¶ä»¶è®¡å管çä¸´æ¶ * @return ç»æ */ @Override public int updateApsPartPlanTemp(ApsPartPlanTemp apsPartPlanTemp) { return apsPartPlanTempMapper.updateApsPartPlanTemp(apsPartPlanTemp); } /** * æ¹éå é¤é¶ä»¶è®¡å管çä¸´æ¶ * * @param ids éè¦å é¤çé¶ä»¶è®¡å管ç临æ¶ä¸»é® * @return ç»æ */ @Override public int deleteApsPartPlanTempByIds(String[] ids) { return apsPartPlanTempMapper.deleteApsPartPlanTempByIds(ids); } /** * å é¤é¶ä»¶è®¡å管ç临æ¶ä¿¡æ¯ * * @param id é¶ä»¶è®¡å管ç临æ¶ä¸»é® * @return ç»æ */ @Override public int deleteApsPartPlanTempById(String id) { return apsPartPlanTempMapper.deleteApsPartPlanTempById(id); } } aps-modules/aps-core/src/main/resources/mapper/core/ApsPartPlanTempMapper.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,194 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.aps.core.mapper.ApsPartPlanTempMapper"> <resultMap type="com.aps.core.domain.ApsPartPlanTemp" id="ApsPartPlanTempResult"> <result property="id" column="id" /> <result property="masterPlanner" column="master_planner" /> <result property="weekDay" column="week_day" /> <result property="weekCycle" column="week_cycle" /> <result property="mainPartNumber" column="main_part_number" /> <result property="mainPartDrawingNumber" column="main_part_drawing_number" /> <result property="customer" column="customer" /> <result property="businessType" column="business_type" /> <result property="documentNumber" column="document_number" /> <result property="requirementType" column="requirement_type" /> <result property="documentStatus" column="document_status" /> <result property="itemNumber" column="item_number" /> <result property="drawingNo" column="drawing_no" /> <result property="versionNumber" column="version_number" /> <result property="productionQuantity" column="production_quantity" /> <result property="goodProductsQuantity" column="good_products_quantity" /> <result property="processNumber" column="process_number" /> <result property="workCenter" column="work_center" /> <result property="department" column="department" /> <result property="planStartDay" column="plan_start_day" /> <result property="planEndDay" column="plan_end_day" /> <result property="standbyNumber" column="standby_number" /> <result property="standbyName" column="standby_name" /> <result property="standbyStock" column="standby_stock" /> <result property="nextProcessDeparment" column="next_process_deparment" /> <result property="isSuspended" column="is_suspended" /> <result property="isOutsourcing" column="is_outsourcing" /> <result property="account" column="account" /> <result property="advancedMaterials" column="advanced_materials" /> <result property="advancedDocumentNumber" column="advanced_document_number" /> <result property="advancedRequirementDay" column="advanced_requirement_day" /> <result property="isPlanComplete" column="is_plan_complete" /> <result property="isStockComplete" column="is_stock_complete" /> <result property="hasTurnback" column="has_turnback" /> <result property="hasRisk" column="has_risk" /> <result property="batchNumber" column="batch_number" /> </resultMap> <sql id="selectApsPartPlanTempVo"> select id, master_planner, week_day, week_cycle, main_part_number, main_part_drawing_number, customer, business_type, document_number, requirement_type, document_status, item_number, drawing_no, version_number, production_quantity, good_products_quantity, process_number, work_center, department, plan_start_day, plan_end_day, standby_number, standby_name, standby_stock, next_process_deparment, is_suspended, is_outsourcing, account, advanced_materials, advanced_document_number, advanced_requirement_day, is_plan_complete, is_stock_complete, has_turnback, has_risk, batch_number from aps_part_plan_temp </sql> <select id="selectApsPartPlanTempList" parameterType="com.aps.core.domain.ApsPartPlanTemp" resultMap="ApsPartPlanTempResult"> <include refid="selectApsPartPlanTempVo"/> <where> <if test="batchNumber != null and batchNumber != ''"> and batch_number = #{batchNumber}</if> </where> </select> <select id="selectApsPartPlanTempById" parameterType="String" resultMap="ApsPartPlanTempResult"> <include refid="selectApsPartPlanTempVo"/> where id = #{id} </select> <insert id="insertApsPartPlanTemp" parameterType="com.aps.core.domain.ApsPartPlanTemp"> insert into aps_part_plan_temp <trim prefix="(" suffix=")" suffixOverrides=","> <if test="id != null and id != ''">id,</if> <if test="masterPlanner != null">master_planner,</if> <if test="weekDay != null">week_day,</if> <if test="weekCycle != null">week_cycle,</if> <if test="mainPartNumber != null">main_part_number,</if> <if test="mainPartDrawingNumber != null">main_part_drawing_number,</if> <if test="customer != null">customer,</if> <if test="businessType != null">business_type,</if> <if test="documentNumber != null">document_number,</if> <if test="requirementType != null">requirement_type,</if> <if test="documentStatus != null">document_status,</if> <if test="itemNumber != null">item_number,</if> <if test="drawingNo != null">drawing_no,</if> <if test="versionNumber != null">version_number,</if> <if test="productionQuantity != null">production_quantity,</if> <if test="goodProductsQuantity != null">good_products_quantity,</if> <if test="processNumber != null">process_number,</if> <if test="workCenter != null">work_center,</if> <if test="department != null">department,</if> <if test="planStartDay != null">plan_start_day,</if> <if test="planEndDay != null">plan_end_day,</if> <if test="standbyNumber != null">standby_number,</if> <if test="standbyName != null">standby_name,</if> <if test="standbyStock != null">standby_stock,</if> <if test="nextProcessDeparment != null">next_process_deparment,</if> <if test="isSuspended != null">is_suspended,</if> <if test="isOutsourcing != null">is_outsourcing,</if> <if test="account != null">account,</if> <if test="advancedMaterials != null">advanced_materials,</if> <if test="advancedDocumentNumber != null">advanced_document_number,</if> <if test="advancedRequirementDay != null">advanced_requirement_day,</if> <if test="isPlanComplete != null">is_plan_complete,</if> <if test="isStockComplete != null">is_stock_complete,</if> <if test="hasTurnback != null">has_turnback,</if> <if test="hasRisk != null">has_risk,</if> <if test="batchNumber != null">batch_number,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="id != null and id != ''">#{id},</if> <if test="masterPlanner != null">#{masterPlanner},</if> <if test="weekDay != null">#{weekDay},</if> <if test="weekCycle != null">#{weekCycle},</if> <if test="mainPartNumber != null">#{mainPartNumber},</if> <if test="mainPartDrawingNumber != null">#{mainPartDrawingNumber},</if> <if test="customer != null">#{customer},</if> <if test="businessType != null">#{businessType},</if> <if test="documentNumber != null">#{documentNumber},</if> <if test="requirementType != null">#{requirementType},</if> <if test="documentStatus != null">#{documentStatus},</if> <if test="itemNumber != null">#{itemNumber},</if> <if test="drawingNo != null">#{drawingNo},</if> <if test="versionNumber != null">#{versionNumber},</if> <if test="productionQuantity != null">#{productionQuantity},</if> <if test="goodProductsQuantity != null">#{goodProductsQuantity},</if> <if test="processNumber != null">#{processNumber},</if> <if test="workCenter != null">#{workCenter},</if> <if test="department != null">#{department},</if> <if test="planStartDay != null">#{planStartDay},</if> <if test="planEndDay != null">#{planEndDay},</if> <if test="standbyNumber != null">#{standbyNumber},</if> <if test="standbyName != null">#{standbyName},</if> <if test="standbyStock != null">#{standbyStock},</if> <if test="nextProcessDeparment != null">#{nextProcessDeparment},</if> <if test="isSuspended != null">#{isSuspended},</if> <if test="isOutsourcing != null">#{isOutsourcing},</if> <if test="account != null">#{account},</if> <if test="advancedMaterials != null">#{advancedMaterials},</if> <if test="advancedDocumentNumber != null">#{advancedDocumentNumber},</if> <if test="advancedRequirementDay != null">#{advancedRequirementDay},</if> <if test="isPlanComplete != null">#{isPlanComplete},</if> <if test="isStockComplete != null">#{isStockComplete},</if> <if test="hasTurnback != null">#{hasTurnback},</if> <if test="hasRisk != null">#{hasRisk},</if> <if test="batchNumber != null">#{batchNumber},</if> </trim> </insert> <update id="updateApsPartPlanTemp" parameterType="com.aps.core.domain.ApsPartPlanTemp"> update aps_part_plan_temp <trim prefix="SET" suffixOverrides=","> <if test="masterPlanner != null">master_planner = #{masterPlanner},</if> <if test="weekDay != null">week_day = #{weekDay},</if> <if test="weekCycle != null">week_cycle = #{weekCycle},</if> <if test="mainPartNumber != null">main_part_number = #{mainPartNumber},</if> <if test="mainPartDrawingNumber != null">main_part_drawing_number = #{mainPartDrawingNumber},</if> <if test="customer != null">customer = #{customer},</if> <if test="businessType != null">business_type = #{businessType},</if> <if test="documentNumber != null">document_number = #{documentNumber},</if> <if test="requirementType != null">requirement_type = #{requirementType},</if> <if test="documentStatus != null">document_status = #{documentStatus},</if> <if test="itemNumber != null">item_number = #{itemNumber},</if> <if test="drawingNo != null">drawing_no = #{drawingNo},</if> <if test="versionNumber != null">version_number = #{versionNumber},</if> <if test="productionQuantity != null">production_quantity = #{productionQuantity},</if> <if test="goodProductsQuantity != null">good_products_quantity = #{goodProductsQuantity},</if> <if test="processNumber != null">process_number = #{processNumber},</if> <if test="workCenter != null">work_center = #{workCenter},</if> <if test="department != null">department = #{department},</if> <if test="planStartDay != null">plan_start_day = #{planStartDay},</if> <if test="planEndDay != null">plan_end_day = #{planEndDay},</if> <if test="standbyNumber != null">standby_number = #{standbyNumber},</if> <if test="standbyName != null">standby_name = #{standbyName},</if> <if test="standbyStock != null">standby_stock = #{standbyStock},</if> <if test="nextProcessDeparment != null">next_process_deparment = #{nextProcessDeparment},</if> <if test="isSuspended != null">is_suspended = #{isSuspended},</if> <if test="isOutsourcing != null">is_outsourcing = #{isOutsourcing},</if> <if test="account != null">account = #{account},</if> <if test="advancedMaterials != null">advanced_materials = #{advancedMaterials},</if> <if test="advancedDocumentNumber != null">advanced_document_number = #{advancedDocumentNumber},</if> <if test="advancedRequirementDay != null">advanced_requirement_day = #{advancedRequirementDay},</if> <if test="isPlanComplete != null">is_plan_complete = #{isPlanComplete},</if> <if test="isStockComplete != null">is_stock_complete = #{isStockComplete},</if> <if test="hasTurnback != null">has_turnback = #{hasTurnback},</if> <if test="hasRisk != null">has_risk = #{hasRisk},</if> <if test="batchNumber != null">batch_number = #{batchNumber},</if> </trim> where id = #{id} </update> <delete id="deleteApsPartPlanTempById" parameterType="String"> delete from aps_part_plan_temp where id = #{id} </delete> <delete id="deleteApsPartPlanTempByIds" parameterType="String"> delete from aps_part_plan_temp where id in <foreach item="id" collection="array" open="(" separator="," close=")"> #{id} </foreach> </delete> </mapper>