推送数据修改
This commit is contained in:
+19
-32
@@ -1165,41 +1165,28 @@ public class ReservationStockOutOrderApplicationService {
|
|||||||
String warehouse = reservationOutMaterialDetailMapper.getWarehouse(kcId);
|
String warehouse = reservationOutMaterialDetailMapper.getWarehouse(kcId);
|
||||||
String opWhLoc = reservationOutMaterialDetailMapper.getOpWhLoc(kcId);
|
String opWhLoc = reservationOutMaterialDetailMapper.getOpWhLoc(kcId);
|
||||||
|
|
||||||
item.put("orderINo", inOrderNumber != null ? inOrderNumber : "");
|
if (inOrderNumber != null) {
|
||||||
item.put("warehouse", warehouse != null ? warehouse : "");
|
item.put("orderINo", inOrderNumber);
|
||||||
item.put("opWhLoc", opWhLoc != null ? opWhLoc : "");
|
}
|
||||||
item.put("billI", inLotNo != null ? inLotNo : "");
|
if (warehouse != null) {
|
||||||
|
item.put("warehouse", warehouse);
|
||||||
// 处理批次号中的数字
|
}
|
||||||
if (inLotNo != null && inLotNo.contains("-")) {
|
if (opWhLoc != null) {
|
||||||
String numStr = inLotNo.substring(inLotNo.lastIndexOf("-") + 1);
|
item.put("opWhLoc", opWhLoc);
|
||||||
try {
|
}
|
||||||
Integer result = Integer.valueOf(numStr);
|
if (inLotNo != null) {
|
||||||
item.put("orderIRow", result);
|
item.put("billI", inLotNo);
|
||||||
item.put("billIRow", result);
|
if (inLotNo.contains("-")) {
|
||||||
} catch (NumberFormatException e) {
|
String numStr = inLotNo.substring(inLotNo.lastIndexOf("-") + 1);
|
||||||
item.put("orderIRow", null);
|
try {
|
||||||
item.put("billIRow", null);
|
Integer result = Integer.valueOf(numStr);
|
||||||
|
item.put("orderIRow", result);
|
||||||
|
item.put("billIRow", result);
|
||||||
|
} catch (NumberFormatException e) {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
item.put("orderIRow", null);
|
|
||||||
item.put("billIRow", null);
|
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
item.put("orderINo", "");
|
|
||||||
item.put("orderIRow", null);
|
|
||||||
item.put("warehouse", "");
|
|
||||||
item.put("opWhLoc", "");
|
|
||||||
item.put("billI", "");
|
|
||||||
item.put("billIRow", null);
|
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
item.put("orderINo", "");
|
|
||||||
item.put("orderIRow", null);
|
|
||||||
item.put("warehouse", "");
|
|
||||||
item.put("opWhLoc", "");
|
|
||||||
item.put("billI", "");
|
|
||||||
item.put("billIRow", null);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
orderList.add(item);
|
orderList.add(item);
|
||||||
|
|||||||
Reference in New Issue
Block a user