|
@@ -67,11 +67,16 @@ public class WarehousingServiceImpl implements WarehousingService {
|
|
|
map.put("errMsg", "物料信息未录入,请联系管理员");
|
|
|
return map;
|
|
|
}
|
|
|
- if (materialClass.getPartType().equals("半成品") || materialClass.getPartType().equals("产成品")) {
|
|
|
+ if(materialClass.getPartType().equals("半成品")){
|
|
|
map.put("msg", "500");
|
|
|
map.put("errMsg", "此物料是" + materialClass.getPartType());
|
|
|
return map;
|
|
|
}
|
|
|
+ if (materialClass.getPartType().equals("产成品")) {
|
|
|
+ map.put("data", new ArrayList<>());
|
|
|
+ map.put("listString", new HashMap<>());//返回库位剩余数量
|
|
|
+ return map;
|
|
|
+ }
|
|
|
Map<String, Object> mapVal = warehousingMapper.getScanIsNot(wllbCode, suppId, unique, producDate, warehouseWhere);
|
|
|
if (Integer.parseInt(mapVal.get("inventoryCount").toString()) != 0 || Integer.parseInt(mapVal.get("virtualCount").toString()) != 0) {
|
|
|
map.put("msg", "500");
|