重庆bug修复

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

@@ -6,6 +6,7 @@ import java.util.List;
 import com.bonus.sgzb.common.core.annotation.Excel;
 import com.bonus.sgzb.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -15,6 +16,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author bonus
  * @date 2023-12-15
  */
+@Data
 public class MaInputRecord extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -63,7 +65,11 @@ public class MaInputRecord extends BaseEntity
     @ApiModelProperty(value = "机具编号")
     private String maCode;
 
-
+    /**
+     * 机具类型，1：数量；0：编码
+     */
+    @ApiModelProperty(value = "管理类型")
+    private String manageType;
 
     public void setId(Long id) 
     {

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

@@ -1090,15 +1090,15 @@ public class TmTaskServiceImpl implements TmTaskService {
             remark = leaseApplyInfo1.getRemark();
             phone = leaseApplyInfo1.getPhone();
         }
-        List<LeaseApplyDetails> leaseApplyDetails = task.getLeaseApplyDetails();
+        List<LeaseApplyInfo> LeaseApplyInfoList = task.getLeaseApplyInfoList();
         Long taskId = task.getTaskId();
-        if (CollUtil.isNotEmpty(leaseApplyDetails)) {
+        if (CollUtil.isNotEmpty(LeaseApplyInfoList)) {
-            for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) {
+            for (LeaseApplyInfo leaseApply : LeaseApplyInfoList) {
                 LeaseApplyInfo leaseApplyInfos = new LeaseApplyInfo();
-                if (leaseApplyDetail.getCompanyId() == null) {
+                if (leaseApply.getCompanyId() == null) {
                     leaseApplyInfos = leaseApplyInfoMapper.selectByTaskIdAndCompIdCq(String.valueOf(taskId));
                 } else {
-                    leaseApplyInfos = leaseApplyInfoMapper.selectByTaskIdAndCompId(String.valueOf(taskId), leaseApplyDetail.getCompanyId());
+                    leaseApplyInfos = leaseApplyInfoMapper.selectByTaskIdAndCompId(String.valueOf(taskId), leaseApply.getCompanyId());
                 }
                 if (leaseApplyInfos == null) {
                     LeaseApplyInfo leaseApplyInfo = new LeaseApplyInfo();
@@ -1115,9 +1115,10 @@ public class TmTaskServiceImpl implements TmTaskService {
                     }
                     leaseApplyInfo.setRemark(remark);
                     leaseApplyInfo.setType(task.getLeaseApplyInfoList().get(0).getType());
-                    leaseApplyInfo.setCompanyId(leaseApplyDetail.getCompanyId());
+                    leaseApplyInfo.setCompanyId(leaseApply.getCompanyId());
                     leaseApplyInfo.setEstimateLeaseTime(task.getEstimateLeaseTime());
                     leaseApplyInfo.setLeaseType(task.getLeaseType());
+                    leaseApplyInfo.setCostBearingParty(leaseApply.getCostBearingParty());
                     res = leaseApplyInfoMapper.insert(leaseApplyInfo);
                 }
             }

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

@@ -83,6 +83,7 @@ public class PurchaseMacodeInfoController extends BaseController {
     @GetMapping(value = "/putinDetails")
     public TableDataInfo putinDetails(PurchaseMacodeInfo purchaseMacodeInfo) {
         startPage();
+
         return getDataTable(purchaseMacodeInfoService.selectPutinDetails(purchaseMacodeInfo));
     }
 

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java

@@ -21,7 +21,7 @@ public interface PurchaseCheckDetailsMapper {
      * @param taskId 新购验收任务详细purchase_check_details主键
      * @return 新购验收任务详细purchase_check_details
      */
-    public PurchaseCheckDetails selectPurchaseCheckDetailsByTaskId(Long taskId);
+    public List<PurchaseCheckDetails> selectPurchaseCheckDetailsByTaskId(Long taskId);
 
     /**
      * 查询新购验收任务详细purchase_check_details列表

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

@@ -18,7 +18,7 @@ public interface IPurchaseCheckDetailsService
      * @param taskId 新购验收任务详细purchase_check_details主键
      * @return 新购验收任务详细purchase_check_details
      */
-    public PurchaseCheckDetails selectPurchaseCheckDetailsByTaskId(Long taskId);
+    public List<PurchaseCheckDetails> selectPurchaseCheckDetailsByTaskId(Long taskId);
 
     /**
      * 查询新购验收任务详细purchase_check_details列表

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

@@ -38,7 +38,7 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer
      * @return 新购验收任务详细purchase_check_details
      */
     @Override
-    public PurchaseCheckDetails selectPurchaseCheckDetailsByTaskId(Long taskId) {
+    public List<PurchaseCheckDetails> selectPurchaseCheckDetailsByTaskId(Long taskId) {
         return purchaseCheckDetailsMapper.selectPurchaseCheckDetailsByTaskId(taskId);
     }
 

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

@@ -302,6 +302,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
      * 通过/不通过
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int modifyManageStatus(MaInputVO maInputVO) {
         Long taskId = maInputVO.getTaskId();
         String checkResult = maInputVO.getCheckResult();
@@ -378,13 +379,27 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
                 purchaseMacodeInfoMapper.deleteMaLabelBindByMaId(maInputRecord.getMaId());
                 //修改purchase_macode_info表
                 purchaseMacodeInfoMapper.updatetePurchaseMaCodeInfoByMaCodeAndTaskIdAndTypeId(taskId, typeId, maInputRecord.getMaCode());
+                if ("1".equals(maInputRecord.getManageType())){
                     //修改purchase_check_details表
                     checkDetailsMapper.updatePurchaseCheckDetailsByTaskId(taskId, typeId);
                 }
             }
+        }
         //判断是否全部已操作（通过或不通过）
         int count=purchaseMacodeInfoMapper.isOperateAll(taskId);
         if (count<=0){
+            //获取该订单下所有的装备信息
+            List<PurchaseCheckDetails> purchaseCheckDetailsList=checkDetailsMapper.selectPurchaseCheckDetailsByTaskId(taskId);
+            //判断每种设备的验收数量和绑定数量一致
+            for (PurchaseCheckDetails purchaseCheckDetails : purchaseCheckDetailsList) {
+                if (StringUtils.isNotNull(purchaseCheckDetails.getBindNum())){
+                    if (purchaseCheckDetails.getCheckNum().compareTo(BigDecimal.valueOf(purchaseCheckDetails.getBindNum()))!=0){
+                        //全部操作以后如果还有未绑定的，则不改变状态
+                        count=1;
+                    }
+                }
+            }
+            if (count==0){
                 //全部审核任务状态改为已审核
                 TmTask task = new TmTask();
                 task.setTaskId(taskId);
@@ -393,6 +408,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
                 task.setUpdateTime(DateUtils.getNowDate());
                 taskMapper.updateTmTask(task);
             }
+        }
         return 1;
     }
 

sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml

@@ -67,13 +67,13 @@
     company_audit_remark, dept_audit_by, dept_audit_time,
     dept_audit_remark, create_by, create_time,
     update_by, update_time, remark,
-      company_id,estimate_lease_time,lease_type)
+    company_id,estimate_lease_time,lease_type,cost_bearing_party)
     values (#{code,jdbcType=VARCHAR}, #{taskId,jdbcType=INTEGER}, #{leasePerson,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR},
     #{type,jdbcType=VARCHAR}, #{companyAuditBy,jdbcType=INTEGER}, #{companyAuditTime,jdbcType=VARCHAR},
     #{companyAuditRemark,jdbcType=VARCHAR}, #{deptAuditBy,jdbcType=INTEGER}, #{deptAuditTime,jdbcType=VARCHAR},
     #{deptAuditRemark,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
     #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR},
-      #{companyId,jdbcType=INTEGER}, #{estimateLeaseTime,jdbcType=TIMESTAMP},#{leaseType,jdbcType=VARCHAR})
+    #{companyId,jdbcType=INTEGER}, #{estimateLeaseTime,jdbcType=TIMESTAMP},#{leaseType,jdbcType=VARCHAR},#{costBearingParty,jdbcType=VARCHAR})
   </insert>
 
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.app.domain.LeaseApplyInfo" useGeneratedKeys="true">

sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml

@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectPurchaseCheckDetailsVo">
-        select id, task_id, type_id, purchase_price, purchase_num, check_num, check_result, supplier_id, status, create_by, production_time, create_time, update_by, update_time, remark, check_url_name, check_url, file_name, file_url, company_id from purchase_check_details
+        select id, task_id, type_id, purchase_price, purchase_num, check_num,bind_num, check_result, supplier_id, status, create_by, production_time, create_time, update_by, update_time, remark, check_url_name, check_url, file_name, file_url, company_id from purchase_check_details
     </sql>
 
     <select id="selectPurchaseCheckDetailsList" parameterType="com.bonus.sgzb.material.domain.PurchaseCheckDetails" resultMap="PurchaseCheckDetailsResult">
@@ -250,7 +250,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <update id="updateByTaskIdTypeId">
-        update purchase_check_details set check_num = #{inputNum},status = #{status},input_num=#{inputNum},input_status='1',input_time=NOW() where task_id = #{taskId} and type_id = #{typeId}
+        update purchase_check_details set status = #{status},input_num=#{inputNum},input_status='1',input_time=NOW() where task_id = #{taskId} and type_id = #{typeId}
     </update>
     <update id="updateCheckDetails">
         update purchase_check_details set status = '0' where task_id = #{taskId}