FeiDaBaoKai/wms_serve_xugongteji
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

根据条码查询物料

Browse Source
This commit is contained in:
陆一凡 2025-03-13 16:05:55 +08:00
parent 14c02e9c6d
commit 7ff44acb10
6 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java
View File

@ -313,14 +313,14 @@ public class AppPmsController extends BaseController {
/** /**
* 模糊查询，查询入库单表 * 模糊查询，查询入库单表
* @param param 查询参数 * @param goodsCode 查询参数
* @return 返回结果 * @return 返回结果
*/ */
@Anonymous @Anonymous
@GetMapping(value = "/getInfoWithString") @GetMapping(value = "/getInfoWithString")
public AjaxResult getInfoWithString(@RequestParam("param") String param) public AjaxResult getInfoWithString(@RequestParam("goodsCode") String goodsCode)
{ {
return success(appPmsOrderInService.getInfoWithString(param)); return success(appPmsOrderInService.getInfoWithString(goodsCode));
} }
/** /**

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java
View File

@ -322,7 +322,7 @@ public class AppTaskController extends BaseController
updateLocation.setLocationId(location.getLocationId()); updateLocation.setLocationId(location.getLocationId());
updateLocation.setLocationStatus(1); updateLocation.setLocationStatus(1);
appLocationService.updateAppLocation(updateLocation); appLocationService.updateAppLocation(updateLocation);
logger.info("wcs入库请求创建成功"); logger.info("wcs入库请求创建成功,载具号{},入库位置{}",wcsStackerTask.getVehicleNo(),location.getLocationId());
return success(wcsDate); return success(wcsDate);
} }
@ -333,6 +333,7 @@ public class AppTaskController extends BaseController
@Transactional @Transactional
public AjaxResult taskResult(@RequestBody TaskResultFeedRequest taskResultFeedRequest) public AjaxResult taskResult(@RequestBody TaskResultFeedRequest taskResultFeedRequest)
{ {
logger.info("任务反馈");
if(ObjectUtil.isEmpty(taskResultFeedRequest.getTaskId()) || if(ObjectUtil.isEmpty(taskResultFeedRequest.getTaskId()) ||
ObjectUtil.isEmpty(taskResultFeedRequest.getVehicleNo())){ ObjectUtil.isEmpty(taskResultFeedRequest.getVehicleNo())){
return error("缺少请求数据"); return error("缺少请求数据");
@ -491,6 +492,7 @@ public class AppTaskController extends BaseController
} }
} }
logger.info("反馈成功");
return AjaxResult.success("成功"); return AjaxResult.success("成功");
} }
@PostMapping("/kk") @PostMapping("/kk")

3
ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderInMapper.java
View File

@ -54,7 +54,8 @@ public interface AppPmsOrderInMapper
public int deleteAppPmsOrderInById(String id); public int deleteAppPmsOrderInById(String id);
public List<AppPmsOrderIn> selectAppPmsOrderInListWithParam(@Param("param") String param); public List<AppPmsOrderIn> selectAppPmsOrderInListWithParam(@Param("goodsCode") String goodsCode);
public List<AppPmsOrderIn> selectAppPmsOrderInListWithEmpty(@Param("goodsCode") String goodsCode);
/** /**
* 批量删除【请填写功能名称】 * 批量删除【请填写功能名称】

2
ruoyi-system/src/main/java/com/ruoyi/app/service/IAppPmsOrderInService.java
View File

@ -61,7 +61,7 @@ public interface IAppPmsOrderInService
*/ */
public int deleteAppPmsOrderInById(String listId); public int deleteAppPmsOrderInById(String listId);
public List<AppPmsOrderIn> getInfoWithString(String param); public List<AppPmsOrderIn> getInfoWithString(String goodsCode);
public int pmsStockInComplete(PmsStockInCompleteReq request); public int pmsStockInComplete(PmsStockInCompleteReq request);

8
ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java
View File

@ -122,11 +122,11 @@ public class AppPmsOrderInServiceImpl implements IAppPmsOrderInService
} }
@Override @Override
public List<AppPmsOrderIn> getInfoWithString(String param) { public List<AppPmsOrderIn> getInfoWithString(String goodsCode) {
if(StringUtils.isEmpty(param)) { if(StringUtils.isEmpty(goodsCode)) {
return appPmsOrderInMapper.selectAppPmsOrderInListWithParam(""); return appPmsOrderInMapper.selectAppPmsOrderInListWithEmpty("");
} }
return appPmsOrderInMapper.selectAppPmsOrderInListWithParam(param); return appPmsOrderInMapper.selectAppPmsOrderInListWithParam(goodsCode);
} }
@Override @Override

11
ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml
View File

@ -77,10 +77,17 @@
<include refid="selectAppPmsOrderInVo"/> <include refid="selectAppPmsOrderInVo"/>
where id = #{id} where id = #{id}
</select> </select>
<select id="selectAppPmsOrderInListWithEmpty" parameterType="String" resultMap="AppPmsOrderInResult">
<include refid="selectAppPmsOrderInVo"/>
where (list_id like concat('%',#{goodsCode},'%') or order_id like concat('%',#{goodsCode},'%') or goods_id like concat('%',#{goodsCode},'%')
or goods_code like concat('%',#{goodsCode},'%') or goods_desc like concat('%',#{goodsCode},'%')) and remaining_num > 0
</select>
<select id="selectAppPmsOrderInListWithParam" parameterType="String" resultMap="AppPmsOrderInResult"> <select id="selectAppPmsOrderInListWithParam" parameterType="String" resultMap="AppPmsOrderInResult">
<include refid="selectAppPmsOrderInVo"/> <include refid="selectAppPmsOrderInVo"/>
where (list_id like concat('%',#{param},'%') or order_id like concat('%',#{param},'%') or goods_id like concat('%',#{param},'%') where goods_code = #{goodsCode} and remaining_num > 0
or goods_code like concat('%',#{param},'%') or goods_desc like concat('%',#{param},'%')) and remaining_num > 0
</select> </select>