|
|
@@ -249,12 +249,12 @@ public class IVTController extends BaseController {
|
|
|
|
|
|
String unBack = "0";
|
|
|
BO subBo = new BO();
|
|
|
- set.add(getString(map,"PURCHASE_ORDER_NO"));
|
|
|
- RowMap rowMap = DBSql.getMap("select ORDER_PRODUCT_ID,sum(QUANTITY_RECEIVED) QUANTITY_RECEIVED from BO_EU_DNIVT_RECEIVE WHERE ORDER_PRODUCT_ID=? group by ORDER_PRODUCT_ID", new Object[]{getString(map,"ID")});
|
|
|
+ set.add(getString(map, "PURCHASE_ORDER_NO"));
|
|
|
+ RowMap rowMap = DBSql.getMap("select ORDER_PRODUCT_ID,sum(QUANTITY_RECEIVED) QUANTITY_RECEIVED from BO_EU_DNIVT_RECEIVE WHERE ORDER_PRODUCT_ID=? group by ORDER_PRODUCT_ID", new Object[]{getString(map, "ID")});
|
|
|
if (null != rowMap) {
|
|
|
- unBack = getUnBack(getString(map,"QUANTITY"), rowMap.getString("QUANTITY_RECEIVED"));
|
|
|
+ unBack = getUnBack(getString(map, "QUANTITY"), rowMap.getString("QUANTITY_RECEIVED"));
|
|
|
if (Integer.valueOf(unBack) <= 0) {
|
|
|
- // System.out.println("采购数量小于已接收数量:" +getString(map,"QUANTITY") + "-----" + rowMap.getString("QUANTITY_RECEIVED"));
|
|
|
+ // System.out.println("采购数量小于已接收数量:" +getString(map,"QUANTITY") + "-----" + rowMap.getString("QUANTITY_RECEIVED"));
|
|
|
// continue;
|
|
|
}
|
|
|
subBo.set("QUANTITY_RECEIVED", rowMap.get("QUANTITY_RECEIVED"));
|
|
|
@@ -274,6 +274,7 @@ public class IVTController extends BaseController {
|
|
|
subBo.set("ORDER_PRODUCT_ID", map.get("ID"));
|
|
|
subBo.set("NOW_COUNT", 0);
|
|
|
subBo.set("CONTRACT_COST_ID", map.get("CONTRACT_COST_ID"));
|
|
|
+ subBo.set("STATUS", "待接收");
|
|
|
subBo.setBindId(createBOProcessInstance.getId());
|
|
|
list.add(subBo);
|
|
|
}
|
|
|
@@ -340,7 +341,7 @@ public class IVTController extends BaseController {
|
|
|
* @param var1
|
|
|
* @return
|
|
|
*/
|
|
|
- public String getString(Map<String, Object> map,String var1) {
|
|
|
+ public String getString(Map<String, Object> map, String var1) {
|
|
|
Object var2;
|
|
|
return (var2 = map.get(var1)) == null ? "" : TypeUtil.convert(var2, String.class);
|
|
|
}
|