JSK 新购完善

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/MachIneDto.java

@@ -155,4 +155,5 @@ public class MachIneDto {
     @ApiModelProperty(value = "表单集合入库数量")
     private BigDecimal putInStoreNum;
 
+    private Long companyId;
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java

@@ -621,6 +621,11 @@ public class MachineServiceImpl implements IMachineService
             }
             machine.setMaStatus("1");
             machine.setMaVender(machine.getSupplierId());
+            /**
+             * jsk
+             */
+            Long companyId=iTypeService.getUserDeptId();
+            machine.setCompanyId(companyId+"");
             int result = machineMapper.insertMachine(machine);
             if (result > 0) {
                 return AjaxResult.success("入库成功");
@@ -705,6 +710,11 @@ public class MachineServiceImpl implements IMachineService
             machine.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getUserId()+"");
             if ("1".equals(machine.getType()) || "2".equals(machine.getType())){
                 //新增设备编码
+                /**
+                 * jsk
+                 */
+                Long companyId=iTypeService.getUserDeptId();
+                machine.setCompanyId(companyId+"");
                 res = machineMapper.insertMachine(machine);
                 if (res<=0){
                     throw new RuntimeException("添加设备失败");

bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java

@@ -214,6 +214,8 @@ public class PurchaseBindServiceImpl implements IPurchaseBindService {
                         purchaseDto.setProductDate(details.get(0).getProductionTime());
                     }
                 }
+                Long companyId=iTypeService.getUserDeptId();
+                purchaseDto.setCompanyId(companyId);
                 if (1 != purchaseStorageMapper.insertMachine(purchaseDto)) {
                     return AjaxResult.error(1116,"插入maMachine时SQL执行失败!");
                 }

bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml

@@ -1973,7 +1973,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bcd.back_num as backNum,
             bcd.create_time as inTime,
             bc.print_status,
-            mt.jiju_type AS jijuType
+            case when mt.jiju_type='1' then '机具' else '安全工器具' end AS jijuType
         FROM
             back_check_details bcd
                 LEFT JOIN back_apply_info bc on bcd.parent_id = bc.id
@@ -1998,7 +1998,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and bp.pro_name like concat('%', #{proName} ,'%')
         </if>
         <if test="keyWord != null and keyWord != ''">
-            and ( bp2.pro_name like concat('%', #{keyWord} ,'%')
+            and ( bp.pro_name like concat('%', #{keyWord} ,'%')
             or  sd.dept_name like concat('%', #{keyWord} ,'%')
             or  mt2.type_name like concat('%', #{keyWord} ,'%')
             or  mt.type_name like concat('%', #{keyWord} ,'%'))

bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml

@@ -1357,7 +1357,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             lod.out_num as outnum,
             mm.ma_code as macode,
             lod.create_time as outTime,
-            mt.jiju_type as jijutype,
+            case when mt.jiju_type='1' then '机具' else '安全工器具' end as jijutype,
             lai.`code` as code,
             lai.lease_person as leaseperson,
             lod.publish_task as publishtask,
@@ -1410,7 +1410,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             lod.out_num as outnum,
             mm.ma_code as macode,
             lod.create_time as outTime,
-            mt.jiju_type as jijutype,
+            case when mt.jiju_type='1' then '机具' else '安全工器具' end as jijutype,
             lpd.`code` as code,
             lpd.lease_person as leaseperson,
             lod.publish_task as publishtask,

bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseStorageMapper.xml

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="outFacCode != null">out_fac_code,</if>
             <if test="taskId != null and taskId != ''">buy_task,</if>
             <if test="supplier != null and supplier != ''">ma_vender,</if>
+            <if test="companyId != null and companyId != ''">company_id,</if>
             create_time
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -26,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="outFacCode != null">#{outFacCode},</if>
             <if test="taskId != null and taskId != ''">#{taskId},</if>
             <if test="supplier != null and supplier != ''">#{supplier},</if>
+            <if test="companyId != null and companyId != ''">#{companyId},</if>
             now()
         </trim>
     </insert>