diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/controller/WsMaInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/controller/WsMaInfoController.java index ad35d7df..53856fa1 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/controller/WsMaInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/controller/WsMaInfoController.java @@ -90,7 +90,7 @@ public class WsMaInfoController extends BaseController { @SysLog(title = "获取出厂厂家", businessType = OperaType.DELETE, logType = 1, module = "获取出厂厂家") @PostMapping("/updateCheckTime") public AjaxResult updateCheckTime(@RequestBody WsMaInfo info) { - return service.updateCheckTime(info.getId()); + return service.updateCheckTime(info.getMaCode()); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/mapper/WsMaInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/mapper/WsMaInfoMapper.java index 212a49f6..c12be761 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/mapper/WsMaInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/mapper/WsMaInfoMapper.java @@ -92,5 +92,5 @@ public interface WsMaInfoMapper { * * @return 条数 */ - int updateCheckTime(Integer id); + int updateCheckTime(String maCode); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/WsMaInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/WsMaInfoService.java index 1c283e2c..965d6a84 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/WsMaInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/WsMaInfoService.java @@ -84,5 +84,5 @@ public interface WsMaInfoService { * * @return 条数 */ - AjaxResult updateCheckTime(Integer id); + AjaxResult updateCheckTime(String maCode); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java index 44df07f5..f4366187 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java @@ -196,13 +196,13 @@ public class WsMaInfoServiceImpl implements WsMaInfoService { /** * 更新时间 * - * @param id + * @param maCode * @return 条数 */ @Override - public AjaxResult updateCheckTime(Integer id) { + public AjaxResult updateCheckTime(String maCode) { try { - int i = mapper.updateCheckTime(id); + int i = mapper.updateCheckTime(maCode); return i > 0 ? AjaxResult.success("更新成功") : AjaxResult.error("更新失败"); } catch (Exception e) { log.error(e.getMessage()); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml index c2fad0d8..21560608 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml @@ -74,6 +74,7 @@ WHERE ma_code = #{maCode} + SELECT - ma.ma_id as maId, - ma.type_id as typeId, - mt2.type_name as materialName, - CASE WHEN ma.machine_name IS NOT NULL THEN ma.machine_name ELSE mt.type_name END as materialModel, - ma.ma_code as maCode, - ma.pre_code as preCode, - sda.dict_label as maStatus, - ma.qr_code as qrCode, - ma.buy_price as buyPrice, - ma.ma_vender as maVender, - ma.out_fac_time as outFacTime, - ma.out_fac_code as outFacCode, - ma.assets_code as assetsCode, - ma.check_man as checkMan, - ma.this_check_time as thisCheckTime, - ma.next_check_time as nextCheckTime, - ma.gps_code as gpsCode, - ma.rfid_code as rfidCode, - ma.erp_code as erpCode, - ma.transfer_code as transferCode, - ma.in_out_num as inOutNum, - ma.own_house as ownHouse, - ma.company_id as companyId, - ma.create_time as createTime, - ma.update_time as updateTime, - ma.inspect_man as inspectMan, - ma.inspect_status as inspectStatus, - ma.phone as phone, - ma.assets_id as assetsId, - ma.remark as remark + ma.ma_id as maId, + ma.type_id as typeId, + mt2.type_name as materialName, + CASE WHEN ma.machine_name IS NOT NULL THEN ma.machine_name ELSE mt.type_name END as materialModel, + ma.ma_code as maCode, + ma.pre_code as preCode, + sda.dict_label as maStatus, + ma.qr_code as qrCode, + ma.buy_price as buyPrice, + msi.supplier as maVender, + ma.out_fac_time as outFacTime, + ma.out_fac_code as outFacCode, + ma.assets_code as assetsCode, + ma.check_man as checkMan, + ma.this_check_time as thisCheckTime, + ma.next_check_time as nextCheckTime, + ma.gps_code as gpsCode, + ma.rfid_code as rfidCode, + ma.erp_code as erpCode, + ma.transfer_code as transferCode, + ma.in_out_num as inOutNum, + ma.own_house as ownHouse, + ma.company_id as companyId, + ma.create_time as createTime, + ma.update_time as updateTime, + ma.inspect_man as inspectMan, + ma.inspect_status as inspectStatus, + ma.phone as phone, + ma.assets_id as assetsId, + ma.remark as remark FROM - ma_machine ma - LEFT JOIN ma_type mt ON ma.type_id = mt.type_id - and mt.`level` = '4' and mt.del_flag = '0' - LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id - and mt2.`level` = '3' and mt2.del_flag = '0' - LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id - and mt3.`level` = '2' and mt3.del_flag = '0' - LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id - and mt4.`level` = '1' and mt4.del_flag = '0' - LEFT JOIN sys_dict_data sda on sda.dict_value = ma.ma_status - and sda.dict_type = "ma_machine_status" + ma_machine ma + LEFT JOIN ma_type mt ON ma.type_id = mt.type_id + and mt.`level` = '4' and mt.del_flag = '0' + LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id + and mt2.`level` = '3' and mt2.del_flag = '0' + LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id + and mt3.`level` = '2' and mt3.del_flag = '0' + LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id + and mt4.`level` = '1' and mt4.del_flag = '0' + LEFT JOIN sys_dict_data sda on sda.dict_value = ma.ma_status + and sda.dict_type = "ma_machine_status" + LEFT JOIN ma_supplier_info msi ON msi.supplier_id = ma.ma_vender where 1=1 - and ma.ma_code LIKE CONCAT('%',#{maCode},'%') + and ma.ma_code LIKE CONCAT('%',#{maCode},'%') - and ma.qr_code = #{qrCode} + and ma.qr_code = #{qrCode}