diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java index f77657fa..b22646ba 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java @@ -78,7 +78,7 @@ public interface PurchaseCheckDetailsMapper { int updateCheckDetailsByTaskId(Long taskId); /** - * 查询 + * 是否为全部不通过 * @param taskId * @return */ @@ -117,7 +117,22 @@ public interface PurchaseCheckDetailsMapper { * 查询 * @param typeId * @param taskId - * @return + * @return int */ Integer selectBindNumByTypeId(@Param("typeId") Long typeId, @Param("taskId") Long taskId); + + /** + * 判断是否全部已操作（不通过或通过） + * @param taskId + * @return int + */ + int isOperateAll(Long taskId); + + /** + * 修改purchase_check_details表 + * @param typeId + * @param taskId + * @return int + */ + int updatePurchaseCheckDetailsByTaskId(@Param("taskId") Long taskId,@Param("typeId") Long typeId); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java index 10ffd2b0..bfb310f2 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java @@ -4,6 +4,7 @@ import com.bonus.sgzb.material.domain.BmNoticeInfo; import com.bonus.sgzb.material.domain.PurchaseCheckInfo; import com.bonus.sgzb.material.domain.PurchaseInput; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -67,9 +68,10 @@ public interface PurchaseCheckInfoMapper /** * 查询新购入库任务列表 * @param taskId + ** @param type 1-验收，2-入库 * @return */ - String selectTypeNameByTaskId(Long taskId); + String selectTypeNameByTaskId(@Param("taskId") Long taskId,@Param("type") String type); /** * 插入 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java index 4b43aed6..dbb1ba08 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java @@ -226,4 +226,33 @@ public interface PurchaseMacodeInfoMapper { */ int insertInputApplyDetails(InputApplyDetails applyDetails); + /** + * 删除ma_machine表 + * @param maId + * @return 结果 + */ + int deleteMaMachineInfoByMaId(Long maId); + + /** + * 删除purchase_macode_info表 + * @param taskId + * @param typeId + * @param maCode + * @return + */ + int updatetePurchaseMaCodeInfoByMaCodeAndTaskIdAndTypeId(@Param("taskId") Long taskId,@Param("typeId") Long typeId,@Param("maCode") String maCode); + + /** + * 删除ma_machine_label表 + * @param maId + * @return int + */ + int deleteMaMachineLabelByMaId(Long maId); + + /** + * 删除ma_label_bind表 + * @param maId + * @return int + */ + int deleteMaLabelBindByMaId(Long maId); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java index a12000ea..8a2a929d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java @@ -86,15 +86,28 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer purchaseCheckDetails.setUpdateTime(DateUtils.getNowDate()); purchaseCheckDetailsMapper.updatePurchaseCheckDetails(purchaseCheckDetails); } - // 当全部为已验收,修改任务验收状态 - int count = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsStatus(taskId); - if (count <= 0) { - TmTask task = new TmTask(); - task.setTaskId(taskId); - task.setTaskStatus(26); - task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - task.setUpdateTime(DateUtils.getNowDate()); - taskMapper.updateTmTask(task); + //判断是否全部已操作（不通过或通过） + int count=purchaseCheckDetailsMapper.isOperateAll(taskId); + if (count<=0){ + //是否为全部不通过 + int count1 = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsStatus(taskId); + if (count1 <= 0) { + //是则将任务状态改为验收不通过 + TmTask task = new TmTask(); + task.setTaskId(taskId); + task.setTaskStatus(27); + task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + task.setUpdateTime(DateUtils.getNowDate()); + taskMapper.updateTmTask(task); + }else { + // 当全部操作,修改任务为验收状态 + TmTask task = new TmTask(); + task.setTaskId(taskId); + task.setTaskStatus(26); + task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + task.setUpdateTime(DateUtils.getNowDate()); + taskMapper.updateTmTask(task); + } } return 1; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java index d31a721b..5b536f19 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java @@ -67,7 +67,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { public List selectPutInListList(PurchaseCheckInfo purchaseCheckInfo) { List purchaseCheckInfos = purchaseCheckInfoMapper.selectPutInListList(purchaseCheckInfo); for (PurchaseCheckInfo checkInfo : purchaseCheckInfos) { - String typeName = purchaseCheckInfoMapper.selectTypeNameByTaskId(checkInfo.getTaskId()); + String typeName = purchaseCheckInfoMapper.selectTypeNameByTaskId(checkInfo.getTaskId(),"2"); checkInfo.setPurchasingTypeName(typeName); } return purchaseCheckInfos; @@ -93,7 +93,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { public List selectPurchaseCheckInfoList(PurchaseCheckInfo purchaseCheckInfo) { List purchaseCheckInfos = purchaseCheckInfoMapper.selectPurchaseCheckInfoList(purchaseCheckInfo); for (PurchaseCheckInfo checkInfo : purchaseCheckInfos) { - String typeName = purchaseCheckInfoMapper.selectTypeNameByTaskId(checkInfo.getTaskId()); + String typeName = purchaseCheckInfoMapper.selectTypeNameByTaskId(checkInfo.getTaskId(),"1"); checkInfo.setPurchasingTypeName(typeName); } return purchaseCheckInfos; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java index 87e3340e..bf95a04e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java @@ -273,17 +273,24 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService List inputRecordList = maInputVO.getInputRecordList(); for (MaInputRecord maInputRecord : inputRecordList) { Long typeId = maInputRecord.getTypeId(); - - // 修改机具入库状态 MaMachine maMachine = new MaMachine(); maMachine.setMaId(maInputRecord.getMaId()); maMachine.setMaCode(maInputRecord.getMaCode()); - maMachine.setMaStatus("1".equals(checkResult) ? "15" : "14"); - purchaseMacodeInfoMapper.updateMaMachine(maMachine); + + //修改编码管理表入库状态 + PurchaseMacodeInfo purchaseMacodeInfo = new PurchaseMacodeInfo(); + purchaseMacodeInfo.setTaskId(taskId); + purchaseMacodeInfo.setTypeId(typeId); + purchaseMacodeInfo.setMaCode(maInputRecord.getMaCode()); // 修改验收任务详细表入库数量 if ("1".equals(checkResult)) { + //修改机具状态为在库 + maMachine.setMaStatus("15"); + purchaseMacodeInfoMapper.updateMaMachine(maMachine); + + // 修改编码管理的入库状态 MaType maType = purchaseMacodeInfoMapper.selectTypeByTypeId(typeId); // 库存添加 @@ -310,17 +317,24 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService applyDetails.setCreateBy(SecurityUtils.getUsername()); applyDetails.setCompanyId(maInputRecord.getCompanyId()); purchaseMacodeInfoMapper.insertInputApplyDetails(applyDetails); - } - // 修改编码管理表入库状态 - PurchaseMacodeInfo purchaseMacodeInfo = new PurchaseMacodeInfo(); - purchaseMacodeInfo.setTaskId(taskId); - purchaseMacodeInfo.setTypeId(typeId); - purchaseMacodeInfo.setMaCode(maInputRecord.getMaCode()); - purchaseMacodeInfo.setStatus("1".equals(checkResult) ? "1" : "0"); - purchaseMacodeInfoMapper.updateMacodeByType(purchaseMacodeInfo); - // 新增入库记录 - purchaseMacodeInfoMapper.insertMaInputRecord(maInputRecord); + purchaseMacodeInfo.setStatus("1"); + purchaseMacodeInfoMapper.updateMacodeByType(purchaseMacodeInfo); + + // 新增入库记录 + purchaseMacodeInfoMapper.insertMaInputRecord(maInputRecord); + }else { + //删除ma_machine表 + purchaseMacodeInfoMapper.deleteMaMachineInfoByMaId(maInputRecord.getMaId()); + //删除ma_machine_label表 + purchaseMacodeInfoMapper.deleteMaMachineLabelByMaId(maInputRecord.getMaId()); + //删除ma_label_bind表 + purchaseMacodeInfoMapper.deleteMaLabelBindByMaId(maInputRecord.getMaId()); + //修改purchase_macode_info表 + purchaseMacodeInfoMapper.updatetePurchaseMaCodeInfoByMaCodeAndTaskIdAndTypeId(taskId,typeId,maInputRecord.getMaCode()); + //修改purchase_check_details表 + checkDetailsMapper.updatePurchaseCheckDetailsByTaskId(taskId,typeId); + } } // 当全部为已入库的时候任务改为入库状态 @@ -337,6 +351,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService return 1; } + /** * 根据机具编码删除编码 * diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml index 0595ba95..9e0a1720 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml @@ -42,17 +42,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join ma_type mt1 on mt.parent_id = mt1.type_id left join ma_supplier_info msi on pcd.supplier_id = msi.supplier_id left join tm_task tk on pcd.task_id = tk.task_id - - and pcd.task_id = #{taskId} - and (mt.type_name like concat('%',#{keyWord},'%') - or mt1.type_name like concat('%',#{keyWord}) or msi.supplier like concat('%',#{keyWord})) - and pcd.type_id = #{typeId} - and pcd.purchase_price = #{purchasePrice} - and pcd.purchase_num = #{purchaseNum} - and pcd.supplier_id = #{supplierId} - and pcd.production_time = #{productionTime} - and pcd.company_id = #{companyId} - + where pcd.status !=3 and pcd.status!=5 + and pcd.task_id = #{taskId} + and (mt.type_name like concat('%',#{keyWord},'%') + or mt1.type_name like concat('%',#{keyWord}) or msi.supplier like concat('%',#{keyWord})) + + and pcd.type_id = #{typeId} + and pcd.purchase_price = #{purchasePrice} + and pcd.purchase_num = #{purchaseNum} + and pcd.supplier_id = #{supplierId} + and pcd.production_time = #{productionTime} + and pcd.company_id = #{companyId} - select count(*) from purchase_check_details where task_id = #{taskId} and status != 1 + select count(*) from purchase_check_details where task_id = #{taskId} and status != 3 select IFNULL(bind_num, 0) from purchase_check_details where task_id = #{taskId} and type_id = #{typeId} + delete from purchase_check_details where task_id = #{taskId} @@ -218,4 +226,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update purchase_check_details set bind_num = #{bindNum} where task_id = #{taskId} and type_id = #{typeId} + + update purchase_check_details set bind_num = bind_num - 1 , status='5' where task_id = #{taskId} and type_id = #{typeId} + \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml index 758162b6..a4209744 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml @@ -103,12 +103,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml index 878d6e91..fce564b9 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml @@ -36,6 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join purchase_check_info pt on pcd.task_id = pt.task_id where pcd.task_id = #{taskId} and mt.manage_type = '0' + and pcd.`status`!=3 + and pcd.`status`!=5 and pmi.type_id = #{typeId} and (mt.type_name like concat('%',#{keyWord},'%') or mt1.type_name like concat('%',#{keyWord},'%')) and mt1.type_name = #{typeName} @@ -142,6 +144,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from ma_machine where ma_code = #{maCode} + + delete from ma_machine where ma_id = #{maId} + + + update + purchase_macode_info + set status='2' + where ma_code = #{maCode} + and task_id = #{taskId} + and type_id = #{typeId} + + + delete from ma_machine_label where ma_id = #{maId} + + + delete from ma_label_bind where ma_id = #{maId} + +