bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

功能完善

This commit is contained in:
bns_han 2024-01-29 15:59:30 +08:00
parent 008bbc2f28
commit dcb492aee6
4 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java
View File

@ -1,11 +1,7 @@
package com.bonus.sgzb.material.controller;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.bean.BeanUtil;
import com.bonus.sgzb.material.domain.BmNoticeInfo;
import com.bonus.sgzb.material.domain.PurchaseInput;
import com.bonus.sgzb.material.service.IPurchaseCheckInfoService;
import com.bonus.sgzb.material.domain.PurchaseCheckInfo;
@ -16,7 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.bonus.sgzb.common.log.annotation.Log;
import com.bonus.sgzb.common.log.enums.BusinessType;
import com.bonus.sgzb.common.security.annotation.RequiresPermissions;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.utils.poi.ExcelUtil;

20
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckInfoService.java
View File

@ -17,8 +17,9 @@ public interface IPurchaseCheckInfoService
{
/**
* 查询新购验收任务purchase_check_info
*
* @param taskId 新购验收任务purchase_check_info主键
* @param taskId
* @param keyword
* 新购验收任务purchase_check_info主键
* @return 新购验收任务purchase_check_info
*/
public PurchaseCheckInfo selectPurchaseCheckInfoByTaskId(Long taskId,String keyword);
@ -41,7 +42,6 @@ public interface IPurchaseCheckInfoService
/**
* 修改新购验收任务purchase_check_info
*
* @param purchaseCheckInfo 新购验收任务purchase_check_info
* @return 结果
*/
@ -63,16 +63,30 @@ public interface IPurchaseCheckInfoService
*/
public int deletePurchaseCheckInfoByTaskId(Long taskId);
/**
* 验收通知
* @param noticeInfoVO
* @return Boolean
*/
Boolean insertBmNoticeInfo(NoticeInfoVO noticeInfoVO) throws Exception;
/**
* 查询新购入库任务列表
* @param purchaseCheckInfo
* @return List<PurchaseCheckInfo>
*/
List<PurchaseCheckInfo> selectPutInListList(PurchaseCheckInfo purchaseCheckInfo);
/**
* 新购工机具验收导出
* @param purchaseCheckInfo
* @return List<PurchaseCheckInfo>
*/
List<PurchaseCheckInfo> exportList(PurchaseCheckInfo purchaseCheckInfo);
/**
* 新购工机具入库导出
* @param purchaseCheckInfo
* @return List<PurchaseInput>
*/
List<PurchaseInput> putInExportList(PurchaseCheckInfo purchaseCheckInfo);
}

12
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java
View File

@ -61,8 +61,6 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer
*/
@Override
public int insertPurchaseCheckDetails(List<PurchaseCheckDetails> purchaseCheckDetailsList) {
// purchaseCheckDetails.setCreateTime(DateUtils.getNowDate());
// return purchaseCheckDetailsMapper.insertPurchaseCheckDetails(purchaseCheckDetails);
return purchaseCheckDetailsMapper.insertPurchaseCheckDetailsList(purchaseCheckDetailsList);
}
@ -73,21 +71,13 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer
* @return 结果
*/
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public int updatePurchaseCheckDetails(List<PurchaseCheckDetails> purchaseCheckDetailsList) {
Long taskId = 0L;
for (PurchaseCheckDetails purchaseCheckDetails : purchaseCheckDetailsList) {
taskId = purchaseCheckDetails.getTaskId();
if ("通过".equals(purchaseCheckDetails.getCheckResult())) {
purchaseCheckDetails.setStatus(1);
// // 通过之后往编码管理表里回填数据
// if ("0".equals(purchaseCheckDetails.getManageType())) {
// PurchaseMacodeInfo macodeInfo = new PurchaseMacodeInfo();
// macodeInfo.setTypeId(purchaseCheckDetails.getTypeId());
// macodeInfo.setTaskId(taskId);
// macodeInfo.setStatus("0");
// macodeInfoService.insertPurchaseMacodeInfo(macodeInfo);
// }
} else if ("不通过".equals(purchaseCheckDetails.getCheckResult())) {
purchaseCheckDetails.setStatus(3);
} else {

27
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java
View File

@ -27,6 +27,17 @@ import javax.annotation.Resource;
@Service
public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService
{
/** 9 */
public static final int NINE = 9;
/** 24 */
public static final int TWENTY_FOUR = 24;
/** 99 */
public static final int NINETY_NINE = 99;
/** 100 */
public static final int ONE_HUNDRED = 100;
/** 1000 */
public static final int ONE_THOUSAND = 1000;
@Resource
private PurchaseCheckInfoMapper purchaseCheckInfoMapper;
@ -110,7 +121,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService
* @return 结果
*/
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public int insertPurchaseCheckInfo(PurchaseCheckInfo purchaseCheckInfo)
{
TmTask task = new TmTask();
@ -140,16 +151,18 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService
return purchaseCheckInfoMapper.insertPurchaseCheckInfo(purchaseCheckInfo);
}
// 采购单号编码生成规则
/**
* 采购单号编码生成规则
*/
private String purchaseCodeRule() {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
Date nowDate = DateUtils.getNowDate();
String format = dateFormat.format(nowDate);
int taskNum = taskMapper.selectTaskNumByMonth(nowDate,23) + 1;
String code="";
if (taskNum>9 && taskNum<100){
if (taskNum>NINE && taskNum<ONE_HUNDRED){
code = "XG" + format + "-00" + taskNum;
}else if (taskNum>99 && taskNum<1000){
}else if (taskNum>NINETY_NINE && taskNum<ONE_THOUSAND){
code = "XG" + format + "-0" + taskNum;
}else {
code = "XG" + format + "-000" + taskNum;
@ -164,12 +177,12 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService
* @return 结果
*/
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public int updatePurchaseCheckInfo(PurchaseCheckInfo purchaseCheckInfo) throws Exception {
Long taskId = purchaseCheckInfo.getTaskId();
TmTask task = taskMapper.selectTmTaskByTaskId(taskId);
// 判断当前任务是否为待通知状态
if (task == null || task.getTaskStatus() != 24) {
if (task == null || task.getTaskStatus() != TWENTY_FOUR) {
throw new Exception("当前任务不可修改!!!");
}
// 批量新增新购任务详情信息
@ -226,7 +239,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService
throw new Exception("任务taskId为空!!");
}
TmTask task1 = taskMapper.selectTmTaskByTaskId(taskId);
if (task1.getTaskStatus() != 24) {
if (task1.getTaskStatus() != TWENTY_FOUR) {
throw new Exception("任务状态不为待通知!!");
}
task.setTaskId(taskId);