实体类修改

src/main/java/cn/ezhizao/project/business/controller/BizLotTechnologicalProcessController.java

@@ -37,13 +37,13 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/business/amend")
 public class BizLotTechnologicalProcessController extends BaseController {
     @Resource
-    private IBizLotTechnologicalProcessService bizTechnologicalAmendService;
+    private IBizLotTechnologicalProcessService bizLotTechnologicalProcessServic;
 
     @Resource
     private IBizTechnologicalProcessService bizTechnologicalProcessService;
 
     @Resource
-    private IBizLotTechnologicalProcessDetailService bizTechnologicalAmendDetailService;
+    private IBizLotTechnologicalProcessDetailService bizLotTechnologicalProcessDetailService;
 
     @Resource
     private IBizTechnologicalProcessDetailService bizTechnologicalProcessDetailService;
@@ -101,7 +101,7 @@ public class BizLotTechnologicalProcessController extends BaseController {
     public TableDataInfo list(BizLotTechnologicalProcess bizLotTechnologicalProcess) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizLotTechnologicalProcess);
         startPage();
-        List<BizLotTechnologicalProcess> list = bizTechnologicalAmendService.getList(bizLotTechnologicalProcess);
+        List<BizLotTechnologicalProcess> list = bizLotTechnologicalProcessServic.getList(bizLotTechnologicalProcess);
         return getDataTable(list);
     }
 
@@ -119,7 +119,7 @@ public class BizLotTechnologicalProcessController extends BaseController {
      */
     @GetMapping("/standardProcess/{processId}")
     public TableDataInfo standardProcess(@PathVariable("processId") Long processId) throws NoSuchFieldException, IllegalAccessException {
-        BizLotTechnologicalProcess amend = bizTechnologicalAmendService.getById(processId);
+        BizLotTechnologicalProcess amend = bizLotTechnologicalProcessServic.getById(processId);
 
         return getDataTable(bizTechnologicalProcessDetailService.getProcessDetailsByTechnicalProcessId(amend.getTechnologicalProcessId()));
     }
@@ -197,11 +197,11 @@ public class BizLotTechnologicalProcessController extends BaseController {
         List<BizTechnologicalProcessDetail> processDetailList = new ArrayList<>();
 
         //是否单批单改
-        if (lot.getIsAmend() == 1) {
+        if (lot.getIsAmend() == 1 || lot.getIsWasteRecycling() == 1) {
             //查询更改后的数据
             BizLotTechnologicalProcessDetail amendDetail = new BizLotTechnologicalProcessDetail();
             amendDetail.setLotTechnologicalProcessId(lot.getTechnologicalProcessId());
-            List<BizLotTechnologicalProcessDetail> amendDetailList = bizTechnologicalAmendDetailService.getList(amendDetail);
+            List<BizLotTechnologicalProcessDetail> amendDetailList = bizLotTechnologicalProcessDetailService.getList(amendDetail);
 
             for (BizLotTechnologicalProcessDetail item : amendDetailList) {
                 BizTechnologicalProcessDetail process = new BizTechnologicalProcessDetail();
@@ -217,31 +217,33 @@ public class BizLotTechnologicalProcessController extends BaseController {
                 process.setProductDescription(item.getProductDescription());
                 processDetailList.add(process);
             }
-        } else if (lot.getIsWasteRecycling() == 1) { //是否废品回用
-            BizTechnologicalWasteRecyclingDetail wasteRecyclingDetail = new BizTechnologicalWasteRecyclingDetail();
-            wasteRecyclingDetail.setTechnologicalWasteRecyclingId(lot.getTechnologicalProcessId());
-            List<BizTechnologicalWasteRecyclingDetail> processList = bizTechnologicalWasteRecyclingDetailService.getList(wasteRecyclingDetail);
-
-            for (BizTechnologicalWasteRecyclingDetail item : processList) {
-                BizTechnologicalProcessDetail process = new BizTechnologicalProcessDetail();
-                process.setProcessId(item.getProcessId());
-                process.setProcessStepNumber(item.getProcessStepNumber());
-                process.setProcessCode(item.getProcessCode());
-                process.setProcessAlias(item.getProcessAlias());
-                process.setProcessKey(item.getProcessKey());
-                process.setProductShaftCategory(item.getProductShaftCategory());
-                process.setProductShaftCategoryName(item.getProductShaftCategoryName());
-                process.setTechnologicalProcessId(item.getTechnologicalWasteRecyclingId());
-                process.setProductId(item.getProductId());
-                process.setProductDescription(item.getProductDescription());
-                processDetailList.add(process);
-            }
-        } else {
+        }  else {
             //查询工序信息
             processDetail.setTechnologicalProcessId(lot.getTechnologicalProcessId());
             processDetailList = bizTechnologicalProcessDetailService.getProcessDetailsByTechnicalProcessId(lot.getTechnologicalProcessId());
 
         }
+//         修改使用方式，暂时注释
+//        else if (lot.getIsWasteRecycling() == 1) { //是否废品回用
+//            BizTechnologicalWasteRecyclingDetail wasteRecyclingDetail = new BizTechnologicalWasteRecyclingDetail();
+//            wasteRecyclingDetail.setTechnologicalWasteRecyclingId(lot.getTechnologicalProcessId());
+//            List<BizTechnologicalWasteRecyclingDetail> processList = bizTechnologicalWasteRecyclingDetailService.getList(wasteRecyclingDetail);
+//
+//            for (BizTechnologicalWasteRecyclingDetail item : processList) {
+//                BizTechnologicalProcessDetail process = new BizTechnologicalProcessDetail();
+//                process.setProcessId(item.getProcessId());
+//                process.setProcessStepNumber(item.getProcessStepNumber());
+//                process.setProcessCode(item.getProcessCode());
+//                process.setProcessAlias(item.getProcessAlias());
+//                process.setProcessKey(item.getProcessKey());
+//                process.setProductShaftCategory(item.getProductShaftCategory());
+//                process.setProductShaftCategoryName(item.getProductShaftCategoryName());
+//                process.setTechnologicalProcessId(item.getTechnologicalWasteRecyclingId());
+//                process.setProductId(item.getProductId());
+//                process.setProductDescription(item.getProductDescription());
+//                processDetailList.add(process);
+//            }
+//        }
 
         //查询报工信息
         lot.setTechnologicalProcessDetailList(selectDayworkItem(processDetailList, lot));
@@ -330,7 +332,7 @@ public class BizLotTechnologicalProcessController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizLotTechnologicalProcess bizLotTechnologicalProcess) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizLotTechnologicalProcess);
-        List<BizLotTechnologicalProcess> list = bizTechnologicalAmendService.getList(bizLotTechnologicalProcess);
+        List<BizLotTechnologicalProcess> list = bizLotTechnologicalProcessServic.getList(bizLotTechnologicalProcess);
         ExcelUtil<BizLotTechnologicalProcess> util = new ExcelUtil<BizLotTechnologicalProcess>(BizLotTechnologicalProcess.class);
         util.exportExcel(response, list, "修改后工艺数据");
     }
@@ -366,7 +368,7 @@ public class BizLotTechnologicalProcessController extends BaseController {
             amend.setProductShaftCategoryName(technologicalProcess.getProductShaftCategoryName());
             amend.setProductCode(technologicalProcess.getProductCode());
             amend.setProductDescription(technologicalProcess.getProductDescription());
-            bizTechnologicalAmendService.save(amend);
+            bizLotTechnologicalProcessServic.save(amend);
 
             List<BizLotTechnologicalProcessDetail> amendDetailList = new ArrayList<>();
 
@@ -393,7 +395,7 @@ public class BizLotTechnologicalProcessController extends BaseController {
             //修改批次工艺信息
             lot.setTechnologicalProcessId(amend.getId());
             lot.setIsAmend(1);
-            bizTechnologicalAmendDetailService.saveBatch(amendDetailList) ;
+            bizLotTechnologicalProcessDetailService.saveBatch(amendDetailList) ;
             newLotList.add(lot);
 //            bizLotService.updateById(lot);
         }
@@ -414,27 +416,30 @@ public class BizLotTechnologicalProcessController extends BaseController {
         int num = 0;//修改过的次数
 
         //是否进行过单批单改
-        if (lot.getIsAmend() == 1) {
+        if (lot.getIsAmend() == 1||lot.getIsWasteRecycling() == 1) {
             //查询单批单改信息
-            BizLotTechnologicalProcess technologicalAmend = bizTechnologicalAmendService.getById(lot.getTechnologicalProcessId());
+            BizLotTechnologicalProcess technologicalAmend = bizLotTechnologicalProcessServic.getById(lot.getTechnologicalProcessId());
 
             //先将lot的工艺id设置为原始工艺id,为了给新改的原始工艺赋值
             lot.setTechnologicalProcessId(technologicalAmend.getTechnologicalProcessId());
             //查询修改过几次
-            List<BizLotTechnologicalProcess> list = bizTechnologicalAmendService.selectUpdateList(lot.getId());
+            List<BizLotTechnologicalProcess> list = bizLotTechnologicalProcessServic.selectUpdateList(lot.getId());
             num = list.size();
             //设为停用
             technologicalAmend.setIsStop(1);
-            bizTechnologicalAmendService.saveOrUpdate(technologicalAmend);
+            bizLotTechnologicalProcessServic.saveOrUpdate(technologicalAmend);
             //查询原始工艺信息
             technologicalProcess = bizTechnologicalProcessService.getById(technologicalAmend.getTechnologicalProcessId());
-        } else if (lot.getIsWasteRecycling() == 1) { //是否废品回用
-            BizTechnologicalWasteRecycling wasteRecycling = bizTechnologicalWasteRecyclingService.getById(lot.getTechnologicalProcessId());
-            technologicalProcess = bizTechnologicalProcessService.getById(wasteRecycling.getTechnologicalProcessId());
-        } else {
+        }  else {
             technologicalProcess = bizTechnologicalProcessService.getById(lot.getTechnologicalProcessId());
         }
 
+//        使用新方法暂时注释
+//        else if (lot.getIsWasteRecycling() == 1) { //是否废品回用
+//            BizTechnologicalWasteRecycling wasteRecycling = bizTechnologicalWasteRecyclingService.getById(lot.getTechnologicalProcessId());
+//            technologicalProcess = bizTechnologicalProcessService.getById(wasteRecycling.getTechnologicalProcessId());
+//        }
+
         //新增修改后工艺信息
         BizLotTechnologicalProcess amend = new BizLotTechnologicalProcess();
         amend.setTenantId(lot.getTenantId());
@@ -452,7 +457,7 @@ public class BizLotTechnologicalProcessController extends BaseController {
         amend.setProductShaftCategoryName(technologicalProcess.getProductShaftCategoryName());
         amend.setProductCode(technologicalProcess.getProductCode());
         amend.setProductDescription(technologicalProcess.getProductDescription());
-        bizTechnologicalAmendService.save(amend);
+        bizLotTechnologicalProcessServic.save(amend);
 
         List<BizLotTechnologicalProcessDetail> amendDetailList = new ArrayList<>();
 
@@ -479,7 +484,7 @@ public class BizLotTechnologicalProcessController extends BaseController {
         //修改批次工艺信息
         lot.setTechnologicalProcessId(amend.getId());
         lot.setIsAmend(1);
-        return success(bizTechnologicalAmendDetailService.saveBatch(amendDetailList) && bizLotService.updateById(lot));
+        return success(bizLotTechnologicalProcessDetailService.saveBatch(amendDetailList) && bizLotService.updateById(lot));
     }
 
     /**
@@ -523,7 +528,7 @@ public class BizLotTechnologicalProcessController extends BaseController {
     @PreAuthorize("@ss.hasPermi('business:amend:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(bizTechnologicalAmendService.getById(id));
+        return success(bizLotTechnologicalProcessServic.getById(id));
     }
 
     /**
@@ -534,7 +539,7 @@ public class BizLotTechnologicalProcessController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody BizLotTechnologicalProcess bizLotTechnologicalProcess) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizLotTechnologicalProcess);
-        return toAjax(bizTechnologicalAmendService.save(bizLotTechnologicalProcess));
+        return toAjax(bizLotTechnologicalProcessServic.save(bizLotTechnologicalProcess));
     }
 
     /**
@@ -545,7 +550,7 @@ public class BizLotTechnologicalProcessController extends BaseController {
     @PutMapping
     public AjaxResult edit(@RequestBody BizLotTechnologicalProcess bizLotTechnologicalProcess) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizLotTechnologicalProcess);
-        return toAjax(bizTechnologicalAmendService.updateById(bizLotTechnologicalProcess));
+        return toAjax(bizLotTechnologicalProcessServic.updateById(bizLotTechnologicalProcess));
     }
 
     /**
@@ -555,6 +560,6 @@ public class BizLotTechnologicalProcessController extends BaseController {
     @Log(title = "修改后工艺", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids) {
-        return toAjax(bizTechnologicalAmendService.removeBatchByIds(ids));
+        return toAjax(bizLotTechnologicalProcessServic.removeBatchByIds(ids));
     }
 }

src/main/java/cn/ezhizao/project/business/domain/BizLotTechnologicalProcess.java

@@ -15,7 +15,7 @@ import io.swagger.annotations.ApiModelProperty;
  * @date 2024-04-07
  */
 @Data
-@TableName(value = "biz_technological_amend")
+@TableName(value = "biz_lot_technological_process")
 public class BizLotTechnologicalProcess extends BaseEntity
 {
     private static final long serialVersionUID = 1L;

src/main/java/cn/ezhizao/project/business/domain/BizLotTechnologicalProcessDetail.java

@@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
  * @date 2024-04-07
  */
 @Data
-@TableName(value = "biz_technological_amend_detail")
+@TableName(value = "biz_lot_technological_process_detail")
 public class BizLotTechnologicalProcessDetail extends BaseEntity
 {
     private static final long serialVersionUID = 1L;

src/main/resources/mybatis/business/BizLotTechnologicalProcessDetailMapper.xml

@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="getList" parameterType="BizLotTechnologicalProcessDetail" resultMap="BizTechnologicalAmendDetailResult">
-        SELECT * FROM biz_technological_amend_detail
+        SELECT * FROM biz_lot_technological_process_detail
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             deleted = 0
             <if test="lotTechnologicalProcessId != null">AND lot_technological_process_id = #{lotTechnologicalProcessId}</if>
@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <delete id="physicalDelete">
-        DELETE FROM biz_technological_amend_detail
+        DELETE FROM biz_lot_technological_process_detail
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             <if test="id != null">
                 id = #{id} AND

src/main/resources/mybatis/business/BizLotTechnologicalProcessMapper.xml

@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="getList" parameterType="BizLotTechnologicalProcess" resultMap="BizTechnologicalAmendResult">
-        SELECT * FROM biz_technological_amend
+        SELECT * FROM biz_lot_technological_process
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             deleted = 0
             AND is_stop = 0
@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getById" parameterType="Long" resultMap="BizTechnologicalAmendResult">
-        SELECT * FROM biz_technological_amend
+        SELECT * FROM biz_lot_technological_process
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             <if test="id != null">
                 id = #{id} AND
@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectUpdateList" parameterType="Long" resultMap="BizTechnologicalAmendResult">
-        SELECT * FROM biz_technological_amend
+        SELECT * FROM biz_lot_technological_process
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             <if test="lotId != null">
                 lot_id = #{lotId} AND
@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <delete id="physicalDelete">
-        DELETE FROM biz_technological_amend
+        DELETE FROM biz_lot_technological_process
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             <if test="id != null">
                 id = #{id} AND