Commit 8e991371 authored by tank.li@mushiny.com's avatar tank.li@mushiny.com

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

parent f172fb41
...@@ -87,6 +87,13 @@ public class ICQAController { ...@@ -87,6 +87,13 @@ public class ICQAController {
return ResponseEntity.ok(JsonUtils.map2Json(resData)); return ResponseEntity.ok(JsonUtils.map2Json(resData));
} }
@PostMapping(value = "/searchSkus", produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<String> searchSkus(@RequestBody String json){
Map data = JsonUtils.json2Map(json);
Map resData = this.icqaService.searchSkus(data);
return ResponseEntity.ok(JsonUtils.map2Json(resData));
}
/** /**
* 查找明细 * 查找明细
* @param json * @param json
......
...@@ -418,4 +418,13 @@ public class ICQAService { ...@@ -418,4 +418,13 @@ public class ICQAService {
} }
return data.get(0); return data.get(0);
} }
public Map searchSkus(Map data) {
//所有的SKU
List<Map> items= this.jdbcRepository.queryBySql(Sql_Table.SQL_FINDALLITEM
,CommonUtils.parseString("FACTORY",data)
,CommonUtils.parseString("FACTORY",data));
data.put("content",items);
return data;
}
} }
...@@ -208,6 +208,18 @@ public class InboundService { ...@@ -208,6 +208,18 @@ public class InboundService {
if(count == 0){ if(count == 0){
messageDTO.setMESSAGE("更新失败,entryId:"+entryId+" skuId:"+skuId); messageDTO.setMESSAGE("更新失败,entryId:"+entryId+" skuId:"+skuId);
messageDTO.setCODE(1); messageDTO.setCODE(1);
return messageDTO;
}
//更新主表记录
List<Map> ids = this.jdbcRepository.queryBySql(Sql_Table.SQL_QUERY_INBOUND_AVAILABLEPOSITION, entryId);
if(ids.isEmpty()){
Map newValue2 = new HashMap();
newValue2.put("STATE",Sql_Table.FINISH);
CommonUtils.modifyUselessInfo(newValue2);
Map con2 = new HashMap();
con2.put("ENTRYID",entryId);
this.jdbcRepository.updateRecords(Sql_Table.WMS_INBOUND_ORDER, newValue2, con2);
} }
return messageDTO; return messageDTO;
......
...@@ -148,4 +148,6 @@ public interface Sql_Table { ...@@ -148,4 +148,6 @@ public interface Sql_Table {
"(SELECT UNITLOAD_ID from \n" + "(SELECT UNITLOAD_ID from \n" +
"(SELECT sum(AMOUNT) as SUMALL,UNITLOAD_ID \n" + "(SELECT sum(AMOUNT) as SUMALL,UNITLOAD_ID \n" +
"FROM INV_STOCKUNIT group by UNITLOAD_ID )UNITLOAD WHERE UNITLOAD.SUMALL>0) limit 1"; "FROM INV_STOCKUNIT group by UNITLOAD_ID )UNITLOAD WHERE UNITLOAD.SUMALL>0) limit 1";
String SQL_QUERY_INBOUND_AVAILABLEPOSITION = "SELECT ID FROM WMS_INBOUND_ORDERPOSITION " +
"WHERE ENTRYID=? AND STATE<>'Finish'" ;
} }
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