diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmSnController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmSnController.java index 229f596..c64ffa0 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmSnController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmSnController.java @@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletResponse; import cn.hutool.core.date.DateUtil; import com.ktg.common.constant.UserConstants; import com.ktg.common.utils.StringUtils; +import com.ktg.mes.wm.domain.vo.WmSnPageVO; import com.ktg.system.strategy.AutoCodeUtil; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -52,7 +53,7 @@ public class WmSnController extends BaseController public TableDataInfo list(WmSn wmSn) { startPage(); - List list = wmSnService.selectWmSnList(wmSn); + List list = wmSnService.getWmSnList(wmSn); return getDataTable(list); } @@ -63,7 +64,7 @@ public class WmSnController extends BaseController public TableDataInfo listSn(WmSn wmSn) { startPage(); - List list = wmSnService.selectSnList(wmSn); + List list = wmSnService.getWmSnList(wmSn); return getDataTable(list); } @@ -145,9 +146,9 @@ public class WmSnController extends BaseController */ @PreAuthorize("@ss.hasPermi('mes:wm:sn:remove')") @Log(title = "SN码", businessType = BusinessType.DELETE) - @DeleteMapping("/{snIds}") - public AjaxResult remove(@PathVariable Long[] snIds) + @GetMapping("/remove") + public AjaxResult remove(String ids) { - return toAjax(wmSnService.deleteWmSnBySnIds(snIds)); + return toAjax(wmSnService.deleteWmSnBySnIds(ids)); } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmSnMobController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmSnMobController.java index fbe32fb..78bf503 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmSnMobController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmSnMobController.java @@ -21,6 +21,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.lang.reflect.Array; +import java.util.Arrays; import java.util.Date; import java.util.List; @@ -140,7 +142,7 @@ public class WmSnMobController extends BaseController { @PreAuthorize("@ss.hasPermi('mes:wm:sn:remove')") @Log(title = "SN码", businessType = BusinessType.DELETE) @DeleteMapping("/{snIds}") - public AjaxResult remove(@PathVariable Long[] snIds) + public AjaxResult remove(@PathVariable String snIds) { return toAjax(wmSnService.deleteWmSnBySnIds(snIds)); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/vo/WmSnPageVO.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/vo/WmSnPageVO.java new file mode 100644 index 0000000..6c0c7f0 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/vo/WmSnPageVO.java @@ -0,0 +1,11 @@ +package com.ktg.mes.wm.domain.vo; + +import com.ktg.mes.wm.domain.WmSn; +import lombok.Data; +import lombok.EqualsAndHashCode; +@EqualsAndHashCode(callSuper = true) +@Data +public class WmSnPageVO extends WmSn { + + private String ids; +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmSnMapper.java b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmSnMapper.java index e8f9d8c..7b02949 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmSnMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmSnMapper.java @@ -2,8 +2,9 @@ package com.ktg.mes.wm.mapper; import java.util.List; -import com.ktg.mes.pro.domain.ProSnProcess; import com.ktg.mes.wm.domain.WmSn; +import com.ktg.mes.wm.domain.vo.WmSnPageVO; +import org.apache.ibatis.annotations.Param; /** * SN码Mapper接口 @@ -23,7 +24,7 @@ public interface WmSnMapper /** * 查询SN码列表 - * + * * @param wmSn SN码 * @return SN码集合 */ @@ -70,8 +71,10 @@ public interface WmSnMapper /** * 批量删除SN码 * - * @param snIds 需要删除的数据主键集合 + * @param ids 需要删除的数据主键集合 * @return 结果 */ - public int deleteWmSnBySnIds(Long[] snIds); + public int deleteWmSnBySnIds(@Param("ids") List ids); + + List getWmSnList(WmSn wmSn); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmSnService.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmSnService.java index a4aff0a..7ba3c3d 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmSnService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmSnService.java @@ -2,6 +2,7 @@ package com.ktg.mes.wm.service; import java.util.List; import com.ktg.mes.wm.domain.WmSn; +import com.ktg.mes.wm.domain.vo.WmSnPageVO; /** * SN码Service接口 @@ -21,7 +22,7 @@ public interface IWmSnService /** * 查询SN码列表 - * + * * @param wmSn SN码 * @return SN码集合 */ @@ -64,7 +65,7 @@ public interface IWmSnService * @param snIds 需要删除的SN码主键集合 * @return 结果 */ - public int deleteWmSnBySnIds(Long[] snIds); + public int deleteWmSnBySnIds(String snIds); /** * 删除SN码信息 @@ -73,4 +74,6 @@ public interface IWmSnService * @return 结果 */ public int deleteWmSnBySnId(Long snId); + + List getWmSnList(WmSn wmSn); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmSnServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmSnServiceImpl.java index c3c8fd7..3b73c2c 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmSnServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmSnServiceImpl.java @@ -1,7 +1,9 @@ package com.ktg.mes.wm.service.impl; +import java.util.ArrayList; import java.util.List; import com.ktg.common.utils.DateUtils; +import com.ktg.mes.wm.domain.vo.WmSnPageVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ktg.mes.wm.mapper.WmSnMapper; @@ -34,7 +36,7 @@ public class WmSnServiceImpl implements IWmSnService /** * 查询SN码列表 - * + * * @param wmSn SN码 * @return SN码 */ @@ -87,9 +89,19 @@ public class WmSnServiceImpl implements IWmSnService * @return 结果 */ @Override - public int deleteWmSnBySnIds(Long[] snIds) + public int deleteWmSnBySnIds(String ids) { - return wmSnMapper.deleteWmSnBySnIds(snIds); + String[] split = ids.split(","); + List longList = new ArrayList<>(); + for (String s : split) { + try { + longList.add(Long.parseLong(s.trim())); + } catch (NumberFormatException e) { + System.err.println("无法解析为 Long 的字符串: " + s); + } + } + + return wmSnMapper.deleteWmSnBySnIds(longList); } /** @@ -103,4 +115,9 @@ public class WmSnServiceImpl implements IWmSnService { return wmSnMapper.deleteWmSnBySnId(snId); } + + @Override + public List getWmSnList(WmSn wmSn) { + return wmSnMapper.getWmSnList(wmSn); + } } diff --git a/ktg-mes/src/main/resources/mapper/wm/WmSnMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmSnMapper.xml index 4267a1c..dba1566 100644 --- a/ktg-mes/src/main/resources/mapper/wm/WmSnMapper.xml +++ b/ktg-mes/src/main/resources/mapper/wm/WmSnMapper.xml @@ -29,11 +29,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + + + + + + + + + + + + select sn_id, sn_code, item_id, item_code, item_name, specification, unit_of_measure, batch_code, workorder_id, gen_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_sn - and sn_code = #{snCode} @@ -79,6 +105,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ps.workstation_id = #{workstationId} order by ps.input_time desc + @@ -155,8 +196,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from wm_sn where sn_id in - - #{snId} + + #{item} \ No newline at end of file