生产终止功能开发

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderServiceImpl.java

@@ -561,7 +561,7 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
                 .eq(ProductionOrderDetail::getProduceOrderId, orderDtoId)
                 .eq(ProductionOrderDetail::getContractId, contractId)
                 .notIn(ProductionOrderDetail::getContractDetailId, cpIds)
-                .set(ProductionOrderDetail::getProduceStatus, 99)
+                .set(ProductionOrderDetail::getProduceStatus, 88)
         );
 
         for (ContractProduct contractProduct : contractProductList) {

hx-sale/src/main/java/com/fjhx/sale/controller/contract/ContractController.java

@@ -354,5 +354,13 @@ public class ContractController {
         contractService.saleOutbound(dto.getId());
     }
 
+    /**
+     * 生产终止
+     */
+    @PostMapping("/productionTermination")
+    public void productionTermination(@RequestBody ContractDto dto) {
+        contractService.productionTermination(dto);
+    }
+
 
 }

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -549,4 +549,9 @@ public class Contract extends BasePo {
      */
     private String alibabaShopName;
 
+    /**
+     * 终止备注
+     */
+    private String terminationRemark;
+
 }

hx-sale/src/main/java/com/fjhx/sale/mapper/contract/ContractMapper.java

@@ -167,4 +167,10 @@ public interface ContractMapper extends BaseMapper<Contract> {
      * 修改生产订单交期确认状态
      */
     void setProductionOrderConfirmStatus(Long id, Integer confirmStatus);
+
+    void setProdOrderProdStatusByContractId(Long contractId, Integer produceStatus);
+
+
+    void setProdTaskProdStatusByContractId(Long contractId, Integer produceStatus);
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/contract/ContractService.java

@@ -253,4 +253,9 @@ public interface ContractService extends BaseService<Contract> {
      * 销售出库
      */
     void saleOutbound(Long id);
+
+    /**
+     * 生产终止
+     */
+    void productionTermination(ContractDto dto);
 }

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -2386,6 +2386,11 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             @Override
             public Long getProvinceId() {
                 return contractDto.getBuyProvinceId();
+            }
+
+            @Override
+            public Long getCityId() {
+                return contractDto.getBuyCityId();
             }            @Override
             public void setProvinceId(Long provinceId) {
                 contractDto.setBuyProvinceId(provinceId);
@@ -2396,10 +2401,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
                 return contractDto.getBuyProvinceName();
             }
 
+
+
             @Override
-            public Long getCityId() {
-                return contractDto.getBuyCityId();
-            }            @Override
             public void setCityId(Long cityId) {
                 contractDto.setBuyCityId(cityId);
             }
@@ -2410,10 +2414,6 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             }
 
 
-
-
-
-
         };
 
         SetCustomizeAreaId setCustomizeAreaId2 = new SetCustomizeAreaId() {
@@ -2426,6 +2426,11 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             @Override
             public Long getProvinceId() {
                 return contractDto.getSellProvinceId();
+            }
+
+            @Override
+            public Long getCityId() {
+                return contractDto.getSellCityId();
             }            @Override
             public void setProvinceId(Long provinceId) {
                 contractDto.setSellProvinceId(provinceId);
@@ -2436,10 +2441,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
                 return contractDto.getSellProvinceName();
             }
 
+
+
             @Override
-            public Long getCityId() {
-                return contractDto.getSellCityId();
-            }            @Override
             public void setCityId(Long cityId) {
                 contractDto.setSellCityId(cityId);
             }
@@ -2450,10 +2454,6 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             }
 
 
-
-
-
-
         };
 
         CustomizeAreaUtil.setAreaId(Arrays.asList(setCustomizeAreaId1, setCustomizeAreaId2));
@@ -3093,4 +3093,22 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         stockWaitDetailsService.saveBatch(stockWaitDetailsList);
     }
 
+    @DSTransactional
+    @Override
+    public void productionTermination(ContractDto dto) {
+        int TERMINATION = FlowStatusEnum1.TERMINATION.getKey();
+
+        contractService.update(q -> q
+                .eq(Contract::getId, dto.getId())
+                .set(Contract::getStatus, TERMINATION)
+                .set(Contract::getAmount, dto.getAmount())
+                .set(Contract::getTerminationRemark, dto.getTerminationRemark())
+                .set(Contract::getUpdateUser, SecurityUtils.getUserId())
+                .set(Contract::getUpdateTime, new Date())
+        );
+
+        baseMapper.setProdOrderProdStatusByContractId(dto.getId(), TERMINATION);
+        baseMapper.setProdTaskProdStatusByContractId(dto.getId(), TERMINATION);
+    }
+
 }

hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -600,4 +600,16 @@
         WHERE id = #{id}
     </update>
 
+    <update id="setProdOrderProdStatusByContractId">
+        UPDATE production_order
+        SET produce_status = #{produceStatus}
+        WHERE contract_id = #{contractId}
+    </update>
+
+    <update id="setProdTaskProdStatusByContractId">
+        UPDATE production_order_detail
+        SET produce_status = #{produceStatus}
+        WHERE contract_id = #{contractId}
+    </update>
+
 </mapper>