sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml

@@ -659,8 +659,7 @@
       bcd.back_num as backNum,
       bcd.parent_id as parentId,
       bcd.create_by as createBy,
-      bcd.ma_id as maId,
+      bcd.ma_id as maId
-      bai.company_id as companyId
     FROM
       back_check_details bcd
         LEFT JOIN back_apply_info bai on bai.id=bcd.parent_id

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

@@ -1,7 +1,11 @@
 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;
@@ -12,6 +16,7 @@ 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;

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

@@ -17,9 +17,8 @@ public interface IPurchaseCheckInfoService
 {
     /**
      * 查询新购验收任务purchase_check_info
-     * @param taskId
+     * 
-     * @param keyword
+     * @param taskId 新购验收任务purchase_check_info主键
-     * 新购验收任务purchase_check_info主键
      * @return 新购验收任务purchase_check_info
      */
     public PurchaseCheckInfo selectPurchaseCheckInfoByTaskId(Long taskId,String keyword);
@@ -42,6 +41,7 @@ public interface IPurchaseCheckInfoService
 
     /**
      * 修改新购验收任务purchase_check_info
+     * 
      * @param purchaseCheckInfo 新购验收任务purchase_check_info
      * @return 结果
      */
@@ -63,30 +63,16 @@ 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);
 }

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

@@ -61,6 +61,8 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer
      */
     @Override
     public int insertPurchaseCheckDetails(List<PurchaseCheckDetails> purchaseCheckDetailsList) {
+//        purchaseCheckDetails.setCreateTime(DateUtils.getNowDate());
+//        return purchaseCheckDetailsMapper.insertPurchaseCheckDetails(purchaseCheckDetails);
         return purchaseCheckDetailsMapper.insertPurchaseCheckDetailsList(purchaseCheckDetailsList);
     }
 
@@ -71,13 +73,21 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer
      * @return 结果
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional
     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 {

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

@@ -27,17 +27,6 @@ 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;
 
@@ -121,7 +110,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService
      * @return 结果
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional
     public int insertPurchaseCheckInfo(PurchaseCheckInfo purchaseCheckInfo)
     {
         TmTask task = new TmTask();
@@ -151,18 +140,16 @@ 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>NINE && taskNum<ONE_HUNDRED){
+        if (taskNum>9 && taskNum<100){
             code = "XG" + format + "-00" + taskNum;
-        }else if (taskNum>NINETY_NINE && taskNum<ONE_THOUSAND){
+        }else if (taskNum>99 && taskNum<1000){
             code = "XG" + format + "-0" + taskNum;
         }else {
             code = "XG" + format + "-000" + taskNum;
@@ -177,12 +164,12 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService
      * @return 结果
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional
     public int updatePurchaseCheckInfo(PurchaseCheckInfo purchaseCheckInfo) throws Exception {
         Long taskId = purchaseCheckInfo.getTaskId();
         TmTask task = taskMapper.selectTmTaskByTaskId(taskId);
         // 判断当前任务是否为待通知状态
-        if (task == null || task.getTaskStatus() != TWENTY_FOUR) {
+        if (task == null || task.getTaskStatus() != 24) {
             throw new Exception("当前任务不可修改!!!");
         }
         // 批量新增新购任务详情信息
@@ -239,7 +226,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService
             throw new Exception("任务taskId为空!!");
         }
         TmTask task1 = taskMapper.selectTmTaskByTaskId(taskId);
-        if (task1.getTaskStatus() != TWENTY_FOUR) {
+        if (task1.getTaskStatus() != 24) {
             throw new Exception("任务状态不为待通知!!");
         }
         task.setTaskId(taskId);