Commit 291406b2 authored by tank.li@mushiny.com's avatar tank.li@mushiny.com

拣货任务完善,出库单与系统绑定 完成后反馈

parent 9309eafc
......@@ -38,9 +38,10 @@ public class InboundController {
String factory = CommonUtils.parseString("factory",data);
String section = CommonUtils.parseString("section",data);
String entryId = CommonUtils.parseString("entryId",data);
String podOrderId = CommonUtils.parseString("podOrderId",data);
//货架的货位 P0000008AA01
String containerId = CommonUtils.parseString("containerId",data);
MessageDTO dto = this.inboundService.store(skuId,stored,containerId,factory,section,entryId);
MessageDTO dto = this.inboundService.store(skuId,stored,containerId,factory,section,entryId,podOrderId);
return ResponseEntity.ok(dto);
}
......
......@@ -86,10 +86,11 @@ public class InboundService {
* @param factory
* @param section
* @param entryId
* @param podOrderId
* @return
*/
public MessageDTO store(String skuId, int stored, String containerId,
String factory, String section, String entryId) {
String factory, String section, String entryId, String podOrderId) {
MessageDTO messageDTO = MessageDTO.success();
List<Map> invs = this.jdbcRepository.queryBySql(Sql_Table.SQL_INV_UNITLOADID,containerId);
if(invs.isEmpty()){
......@@ -148,12 +149,25 @@ public class InboundService {
String pId = CommonUtils.parseString("ID", ibOrderPosition);
//更新入库单状态
this.updateInboundOrderStatus(entryId,skuId, Sql_Table.FINISH,stored,msg);
//结束货架任务信息 PodOrder
this.updateInboundPodOrder(Sql_Table.FINISH, podOrderId);
//增加入库流水记录
this.add2InboundHistory(entryId,pId,skuId,containerId);
return messageDTO;
}
private void updateInboundPodOrder(String state, String podOrderId) {
Map newValue = new HashMap();
newValue.put("STATE",state);
CommonUtils.modifyUselessInfo(newValue);
Map con = new HashMap();
con.put("ID",podOrderId);
//
int count = this.jdbcRepository.updateRecords(Sql_Table.WMS_INBOUND_PODORDER, newValue, con);
}
private void add2InboundHistory(String entryId, String pId, String skuId, String containerId) {
//TODO
}
......
......@@ -96,6 +96,7 @@ public interface Sql_Table {
String SQL_QUERY_PODORDRTASK = "select WMS_INBOUND_PODORDER.* from WMS_INBOUND_PODORDER, WMS_INBOUND_ORDERPOSITION \n" +
" where WMS_INBOUND_PODORDER.ENTRYPOSITIONID = WMS_INBOUND_ORDERPOSITION.ID\n" +
" and WMS_INBOUND_PODORDER.STATE = 'Available' \n" +
" and WMS_INBOUND_ORDERPOSITION.STATE = 'Available' \n" +
" and WMS_INBOUND_PODORDER.POD_ID=? and WMS_INBOUND_PODORDER.POD_FACE=?\n" +
" ORDER BY WMS_INBOUND_PODORDER.CREATED_DATE DESC limit 1";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment