bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/MaMachine.java

@@ -1,40 +0,0 @@
-package com.bonus.base.api.domain;
-
-import com.bonus.common.core.web.domain.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * 机具类型表ma_type(MaType)实体类
- *
- * @author makejava
- * @since 2024-08-13 10:13:47
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class MaMachine extends BaseEntity implements Serializable {
-    private static final long serialVersionUID = 135108051525707131L;
-
-
-    /**
-     * id
-     */
-    private int id;
-
-    private int typeId;
-
-    private String status;
-
-
-    private String maCode;
-
-    private String purchaseId;
-
-
-
-}
-

bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseStorageController.java

@@ -1,6 +1,5 @@
 package com.bonus.purchase.controller;
 
-import com.bonus.base.api.domain.MaType;
 import com.bonus.common.core.domain.ResultBean;
 import com.bonus.common.core.utils.poi.ExcelUtil;
 import com.bonus.common.core.web.controller.BaseController;
@@ -27,7 +26,7 @@ import java.util.List;
 @RequestMapping("/purchase/store")
 public class BpmPurchaseStorageController extends BaseController {
 
-    @Autowired
+
     private BpmPurchaseStorageService purchaseStorageService;
 
     @Autowired
@@ -56,22 +55,19 @@ public class BpmPurchaseStorageController extends BaseController {
     /*
     * 入库
     * */
-    @PostMapping
+    @PostMapping(value = "")
     public int warehouse(PurchaseStorageDto purchaseStorageDto) {
+        bpmPurchaseInfoService.updateStatusByIdIn(Integer.valueOf(purchaseStorageDto.getStatus()),purchaseStorageDto.getId());
         PurchaseStorageDto purchaseStorageDto1 = purchaseStorageService.selectByPrimaryKey(purchaseStorageDto.getId());
-        MaType maType = purchaseStorageService.selectByTypeId(purchaseStorageDto1.getTypeId());
+        if (purchaseStorageDto1.getId() == null){
-
+            throw new RuntimeException("未找到对应的数据");
-        if (maType.getManageType() == "1"){
-            int status = purchaseStorageService.updateStorageNum(purchaseStorageDto1.getInputNum(),purchaseStorageDto1.getTypeId());
-        }else {
-            int status = purchaseStorageService.insertMaMachine(purchaseStorageDto1);
         }
-        return purchaseStorageService.setStatus();
+        return purchaseStorageService.insertWarehouse(purchaseStorageDto1);
     }
     /*
     * 入库驳回
     * */
-    @PutMapping(value = "/reject")
+    @PutMapping(value = "reject")
     public int reject(PurchaseStorageDto purchaseStorageDto) {
         return bpmPurchaseInfoService.updateStatusByIdIn(Integer.valueOf(purchaseStorageDto.getStatus()),purchaseStorageDto.getId());
     }

bonus-modules/bonus-task/src/main/java/com/bonus/purchase/dto/PurchaseStorageDto.java

@@ -19,9 +19,6 @@ public class PurchaseStorageDto {
     @ApiModelProperty(value="供应商id")
     private Integer supplierId;
 
-    @ApiModelProperty(value="入库数量")
-    private Integer inputNum;
-
     @ApiModelProperty(value = "开始时间")
     private String startTime;
 

bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/BpmPurchaseStorageMapper.java

@@ -1,7 +1,5 @@
 package com.bonus.purchase.mapper;
 
-import com.bonus.base.api.domain.MaMachine;
-import com.bonus.base.api.domain.MaType;
 import com.bonus.purchase.domain.PurchaseStorageDto;
 import com.bonus.purchase.vo.PurchaseVo;
 
@@ -17,13 +15,5 @@ public interface BpmPurchaseStorageMapper {
 
 
     int insertWarehouse(PurchaseStorageDto purchaseStorageDto);
-
-    MaType selectByTypeId(Integer typeId);
-
-    int updateStorageNum(Integer inputNum, Integer typeId);
-
-    int setStatus();
-
-    int insertmaMachine(MaMachine maMachine);
 }
 

bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/BpmPurchaseStorageService.java

@@ -1,6 +1,5 @@
 package com.bonus.purchase.service;
 
-import com.bonus.base.api.domain.MaType;
 import com.bonus.purchase.domain.PurchaseStorageDto;
 import com.bonus.purchase.vo.PurchaseVo;
 
@@ -31,12 +30,4 @@ public interface BpmPurchaseStorageService {
 
 
     int insertWarehouse(PurchaseStorageDto purchaseStorageDto);
-
-    MaType selectByTypeId(Integer typeId);
-
-    int updateStorageNum(Integer inputNum, Integer typeId);
-
-    int setStatus();
-
-    int insertMaMachine(PurchaseStorageDto purchaseStorageDto1);
 }

bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseStorageServiceImpl.java

@@ -1,7 +1,5 @@
 package com.bonus.purchase.service.impl;
 
-import com.bonus.base.api.domain.MaMachine;
-import com.bonus.base.api.domain.MaType;
 import com.bonus.purchase.domain.PurchaseStorageDto;
 import com.bonus.purchase.mapper.BpmPurchaseStorageMapper;
 import com.bonus.purchase.service.BpmPurchaseStorageService;
@@ -39,29 +37,6 @@ public class BpmPurchaseStorageServiceImpl implements BpmPurchaseStorageService
         return bpmPurchaseStorageMapper.insertWarehouse(purchaseStorageDto);
     }
 
-    @Override
-    public MaType selectByTypeId(Integer typeId) {
-        return bpmPurchaseStorageMapper.selectByTypeId(typeId);
-    }
-
-    @Override
-    public int updateStorageNum(Integer inputNum, Integer typeId) {
-        return bpmPurchaseStorageMapper.updateStorageNum(inputNum,typeId);
-    }
-
-    @Override
-    public int setStatus() {
-        return bpmPurchaseStorageMapper.setStatus();
-    }
-
-    @Override
-    public int insertMaMachine(PurchaseStorageDto purchaseStorageDto1) {
-        MaMachine maMachine = new MaMachine();
-        maMachine.setTypeId(purchaseStorageDto1.getTypeId());
-        maMachine.setStatus(String.valueOf(61));
-        maMachine.setPurchaseId(String.valueOf(purchaseStorageDto1.getId()));
-        return bpmPurchaseStorageMapper.insertmaMachine(maMachine);
-    }
 
 
 }

bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseStorageMapper.xml

@@ -9,24 +9,6 @@
         #{id},#{taskId},#{typeId},#{maId},#{manageType},#{creator},#{createTime},#{status},#{inputNum},#{inputType}
         )
     </insert>
-    <insert id="insertmaMachine" parameterType="com.bonus.base.api.domain.MaMachine">
-        INSERT INTO ma_machine(
-        type_id,purchase_id,ma_code
-        )VALUES
-        (
-        #{typeId},#{purchaseId},null
-        )
-    </insert>
-    <update id="updateStorageNum" parameterType="java.lang.Integer">
-        UPDATE ma_type
-        SET storage_num = #{inputNum} + storage_num
-        WHERE
-        id = #{typeId}
-    </update>
-    <update id="setStatus">
-        update bpm_purchase_info
-        SET status = '61'
-    </update>
 
 
     <select id="selectAll" resultType="com.bonus.purchase.vo.PurchaseVo">
@@ -116,8 +98,4 @@
         from bpm_purchase_info
         where id = #{id}
     </select>
-    <select id="selectByTypeId" resultType="com.bonus.base.api.domain.MaType" parameterType="java.lang.Integer">
-        select * from ma_type
-        where id = #{typeId}
-    </select>
 </mapper>