root/XuGongHanYunWMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add：取放货确认

Browse Source
This commit is contained in:
liuxy
2025-09-01 18:07:56 +08:00
parent fdb44796c1
commit 21c7360381
8 changed files with 335 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/controller/SchBasePointController.java
View File

@@ -75,4 +75,18 @@ public class SchBasePointController {
schBasePointService.changeLock(points);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@Log("确认取货")
@PostMapping("/getConfirm")
public ResponseEntity<Object> getConfirm(@RequestBody JSONObject whereJson) {
schBasePointService.getConfirm(whereJson);
return new ResponseEntity<>(HttpStatus.OK);
}
@Log("确认放货")
@PostMapping("/putConfirm")
public ResponseEntity<Object> putConfirm(@RequestBody JSONObject whereJson) {
schBasePointService.putConfirm(whereJson);
return new ResponseEntity<>(HttpStatus.OK);
}
}

12
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/ISchBasePointService.java
View File

@@ -90,4 +90,16 @@ public interface ISchBasePointService extends IService<SchBasePoint> {
* @param point_code 点位编码
*/
void unLockPoint(String point_code);
/**
* 确认取货
* @param whereJson 点位实体
*/
void getConfirm(JSONObject whereJson);
/**
* 确认放货
* @param whereJson 点位实体
*/
void putConfirm(JSONObject whereJson);
}

3
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.xml
View File

@@ -54,6 +54,9 @@
<if test="whereJson.point_status != null">
AND p.point_status = #{whereJson.point_status}
</if>
<if test="whereJson.vehicle_code != null">
AND p.vehicle_code = #{whereJson.vehicle_code}
</if>
<if test="whereJson.is_used != null">
AND p.is_used = #{whereJson.is_used}
</if>

1
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dto/SchBasePointQuery.java
View File

@@ -15,6 +15,7 @@ public class SchBasePointQuery implements Serializable {
private String region_code;
private String point_type;
private String point_status;
private String vehicle_code;
private Boolean is_used;
private Boolean lock_type;
private Boolean parent_point;

22
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java
View File

@@ -23,6 +23,7 @@ import org.nl.wms.sch_manage.service.dao.mapper.SchBaseRegionMapper;
import org.nl.wms.sch_manage.service.dto.SchBasePointQuery;
import org.nl.wms.sch_manage.service.util.PointUtils;
import org.nl.wms.warehouse_management.enums.IOSConstant;
import org.nl.wms.warehouse_management.enums.IOSEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -199,4 +200,25 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
);
}
@Override
@Transactional
public void getConfirm(JSONObject whereJson) {
SchBasePoint pointDao = this.getById(whereJson.getString("point_code"));
// 清空点位信息
pointDao.setVehicle_code("");
pointDao.setPoint_status(IOSEnum.POINT_STATUS.code("空位"));
pointDao.setIng_task_code("");
this.updateById(pointDao);
// TODO 通知ACS可以离开
}
@Override
@Transactional
public void putConfirm(JSONObject whereJson) {
SchBasePoint pointDao = this.getById(whereJson.getString("point_code"));
pointDao.setPoint_status(IOSEnum.POINT_STATUS.code("有箱有料"));
pointDao.setVehicle_code(whereJson.getString("vehicle_code"));
this.updateById(pointDao);
// TODO 通知ACS可以离开
}
}