Add contract to prject

Author: Philip Zhang

bizcore/WEB-INF/retailscm_core_src/com/doublechaintech/retailscm/RetailscmCandidatesUtil.java

@@ -49,7 +49,7 @@ public class RetailscmCandidatesUtil extends BaseCandidatesUtil{
 		_for("transport_fleet").usedIn("transport_truck").withRole("owner");
 		_for("transport_fleet").usedIn("transport_task").withRole("belongs_to");
 		_for("transport_fleet").isTree("false");
-		_for("transport_fleet").hasFields(";id;name;contact_number;last_update_time;version;");
+		_for("transport_fleet").hasFields(";id;name;contact_number;contract;last_update_time;version;");
 		_for("transport_fleet").targetType("transport_fleet");
 		_for("transport_fleet").anchorColumn("owner");
 		_for("retail_store_decoration").usedIn("retail_store").withRole("decoration");
@@ -257,7 +257,7 @@ public class RetailscmCandidatesUtil extends BaseCandidatesUtil{
 		_for("warehouse").usedIn("smart_pallet").withRole("warehouse");
 		_for("warehouse").usedIn("receiving_space").withRole("warehouse");
 		_for("warehouse").isTree("false");
-		_for("warehouse").hasFields(";id;location;contact_number;total_area;latitude;longitude;last_update_time;version;");
+		_for("warehouse").hasFields(";id;location;contact_number;total_area;latitude;longitude;contract;last_update_time;version;");
 		_for("warehouse").targetType("warehouse");
 		_for("warehouse").anchorColumn("owner");
 		_for("retail_store_order").referTo("retail_store_country_center").withRole("seller");
@@ -267,7 +267,7 @@ public class RetailscmCandidatesUtil extends BaseCandidatesUtil{
 		_for("retail_store_order").usedIn("retail_store_order_shipping_group").withRole("biz_order");
 		_for("retail_store_order").usedIn("goods").withRole("retail_store_order");
 		_for("retail_store_order").isTree("false");
-		_for("retail_store_order").hasFields(";id;title;total_amount;last_update_time;version;");
+		_for("retail_store_order").hasFields(";id;title;total_amount;contract;last_update_time;version;");
 		_for("retail_store_order").targetType("retail_store_order");
 		_for("retail_store_order").anchorColumn("buyer");
 		_for("goods_supplier").referTo("retail_store_country_center").withRole("belong_to");
@@ -463,7 +463,7 @@ public class RetailscmCandidatesUtil extends BaseCandidatesUtil{
 		_for("supply_order").usedIn("supply_order_payment_group").withRole("biz_order");
 		_for("supply_order").usedIn("goods").withRole("biz_order");
 		_for("supply_order").isTree("false");
-		_for("supply_order").hasFields(";id;title;total_amount;last_update_time;version;");
+		_for("supply_order").hasFields(";id;title;contract;total_amount;last_update_time;version;");
 		_for("supply_order").targetType("supply_order");
 		_for("supply_order").anchorColumn("buyer");
 		_for("public_key_type").referTo("user_domain").withRole("domain");

bizcore/WEB-INF/retailscm_core_src/com/doublechaintech/retailscm/RetailscmChecker.java

@@ -1967,6 +1967,14 @@ public RetailscmChecker checkTitleOfSupplyOrder(String title)
 		return this;
 	}
 
+	public static final String  CONTRACT_OF_SUPPLY_ORDER ="supply_order.contract";
+	public RetailscmChecker checkContractOfSupplyOrder(String contract)
+	{		
+	 	checkDocument(contract,0, 1024,CONTRACT_OF_SUPPLY_ORDER );
+		
+		return this;
+	}
+
 	public static final String  TOTAL_AMOUNT_OF_SUPPLY_ORDER ="supply_order.total_amount";
 	public RetailscmChecker checkTotalAmountOfSupplyOrder(BigDecimal totalAmount)
 	{		
@@ -2167,6 +2175,14 @@ public RetailscmChecker checkTotalAmountOfRetailStoreOrder(BigDecimal totalAmoun
 		return this;
 	}
 
+	public static final String  CONTRACT_OF_RETAIL_STORE_ORDER ="retail_store_order.contract";
+	public RetailscmChecker checkContractOfRetailStoreOrder(String contract)
+	{		
+	 	checkDocument(contract,0, 1024,CONTRACT_OF_RETAIL_STORE_ORDER );
+		
+		return this;
+	}
+
 	public static final String  VERSION_OF_RETAIL_STORE_ORDER ="retail_store_order.version";
 	public RetailscmChecker checkVersionOfRetailStoreOrder(int version)
 	{		
@@ -2375,6 +2391,14 @@ public RetailscmChecker checkLongitudeOfWarehouse(BigDecimal longitude)
 		return this;
 	}
 
+	public static final String  CONTRACT_OF_WAREHOUSE ="warehouse.contract";
+	public RetailscmChecker checkContractOfWarehouse(String contract)
+	{		
+	 	checkDocument(contract,0, 1024,CONTRACT_OF_WAREHOUSE );
+		
+		return this;
+	}
+
 	public static final String  VERSION_OF_WAREHOUSE ="warehouse.version";
 	public RetailscmChecker checkVersionOfWarehouse(int version)
 	{		
@@ -3263,6 +3287,14 @@ public RetailscmChecker checkOwnerIdOfTransportFleet(String ownerId)
 		return this;
 	}
 
+	public static final String  CONTRACT_OF_TRANSPORT_FLEET ="transport_fleet.contract";
+	public RetailscmChecker checkContractOfTransportFleet(String contract)
+	{		
+	 	checkDocument(contract,0, 1024,CONTRACT_OF_TRANSPORT_FLEET );
+		
+		return this;
+	}
+
 	public static final String  VERSION_OF_TRANSPORT_FLEET ="transport_fleet.version";
 	public RetailscmChecker checkVersionOfTransportFleet(int version)
 	{		

bizcore/WEB-INF/retailscm_core_src/com/doublechaintech/retailscm/RetailscmObjectChecker.java

@@ -865,6 +865,7 @@ public RetailscmObjectChecker checkAndFixSupplyOrder(BaseEntity supplyOrderAsBas
 		commonObjectPropertyCheck(supplyOrderAsBaseEntity,"buyer",this::checkBuyerOfSupplyOrder);
 		commonObjectPropertyCheck(supplyOrderAsBaseEntity,"seller",this::checkSellerOfSupplyOrder);
 		commonObjectPropertyCheck(supplyOrderAsBaseEntity,"title",this::checkTitleOfSupplyOrder);
+		commonObjectPropertyCheck(supplyOrderAsBaseEntity,"contract",this::checkContractOfSupplyOrder);
 		commonObjectPropertyCheck(supplyOrderAsBaseEntity,"totalAmount",this::checkTotalAmountOfSupplyOrder);
 		commonObjectPropertyAssign(supplyOrderAsBaseEntity,"lastUpdateTime",this::assignLastUpdateTimeOfSupplyOrder);
 		commonObjectPropertyCheck(supplyOrderAsBaseEntity,"version",this::checkVersionOfSupplyOrder);
@@ -935,6 +936,7 @@ public RetailscmObjectChecker checkAndFixRetailStoreOrder(BaseEntity retailStore
 		commonObjectPropertyCheck(retailStoreOrderAsBaseEntity,"seller",this::checkSellerOfRetailStoreOrder);
 		commonObjectPropertyCheck(retailStoreOrderAsBaseEntity,"title",this::checkTitleOfRetailStoreOrder);
 		commonObjectPropertyCheck(retailStoreOrderAsBaseEntity,"totalAmount",this::checkTotalAmountOfRetailStoreOrder);
+		commonObjectPropertyCheck(retailStoreOrderAsBaseEntity,"contract",this::checkContractOfRetailStoreOrder);
 		commonObjectPropertyAssign(retailStoreOrderAsBaseEntity,"lastUpdateTime",this::assignLastUpdateTimeOfRetailStoreOrder);
 		commonObjectPropertyCheck(retailStoreOrderAsBaseEntity,"version",this::checkVersionOfRetailStoreOrder);
 		commonObjectPropertyCheck(retailStoreOrderAsBaseEntity,"retailStoreOrderLineItemList",this::checkRetailStoreOrderLineItemListOfRetailStoreOrder);
@@ -1006,6 +1008,7 @@ public RetailscmObjectChecker checkAndFixWarehouse(BaseEntity warehouseAsBaseEnt
 		commonObjectPropertyCheck(warehouseAsBaseEntity,"owner",this::checkOwnerOfWarehouse);
 		commonObjectPropertyCheck(warehouseAsBaseEntity,"latitude",this::checkLatitudeOfWarehouse);
 		commonObjectPropertyCheck(warehouseAsBaseEntity,"longitude",this::checkLongitudeOfWarehouse);
+		commonObjectPropertyCheck(warehouseAsBaseEntity,"contract",this::checkContractOfWarehouse);
 		commonObjectPropertyAssign(warehouseAsBaseEntity,"lastUpdateTime",this::assignLastUpdateTimeOfWarehouse);
 		commonObjectPropertyCheck(warehouseAsBaseEntity,"version",this::checkVersionOfWarehouse);
 		commonObjectPropertyCheck(warehouseAsBaseEntity,"storageSpaceList",this::checkStorageSpaceListOfWarehouse);
@@ -1284,6 +1287,7 @@ public RetailscmObjectChecker checkAndFixTransportFleet(BaseEntity transportFlee
 		commonObjectPropertyCheck(transportFleetAsBaseEntity,"name",this::checkNameOfTransportFleet);
 		commonObjectPropertyCheck(transportFleetAsBaseEntity,"contactNumber",this::checkContactNumberOfTransportFleet);
 		commonObjectPropertyCheck(transportFleetAsBaseEntity,"owner",this::checkOwnerOfTransportFleet);
+		commonObjectPropertyCheck(transportFleetAsBaseEntity,"contract",this::checkContractOfTransportFleet);
 		commonObjectPropertyAssign(transportFleetAsBaseEntity,"lastUpdateTime",this::assignLastUpdateTimeOfTransportFleet);
 		commonObjectPropertyCheck(transportFleetAsBaseEntity,"version",this::checkVersionOfTransportFleet);
 		commonObjectPropertyCheck(transportFleetAsBaseEntity,"transportTruckList",this::checkTransportTruckListOfTransportFleet);

bizcore/WEB-INF/retailscm_core_src/com/doublechaintech/retailscm/RetailscmResources_en_US.properties

@@ -683,6 +683,7 @@ supply_order.transfer_to_buyer=Transfer to Another Retail Store Country Center
 supply_order.seller=Seller
 supply_order.transfer_to_seller=Transfer to Another Goods Supplier
 supply_order.title=Title
+supply_order.contract=Contract
 supply_order.total_amount=Total Amount
 supply_order.last_update_time=Last Update Time
 supply_order.version=Version
@@ -738,6 +739,7 @@ retail_store_order.seller=Seller
 retail_store_order.transfer_to_seller=Transfer to Another Retail Store Country Center
 retail_store_order.title=Title
 retail_store_order.total_amount=Total Amount
+retail_store_order.contract=Contract
 retail_store_order.last_update_time=Last Update Time
 retail_store_order.version=Version
 retail_store_order.addRetailStoreOrderLineItem=Add Retail Store Order Line Item
@@ -793,6 +795,7 @@ warehouse.owner=Owner
 warehouse.transfer_to_owner=Transfer to Another Retail Store Country Center
 warehouse.latitude=Latitude
 warehouse.longitude=Longitude
+warehouse.contract=Contract
 warehouse.last_update_time=Last Update Time
 warehouse.version=Version
 warehouse.addStorageSpace=Add Storage Space
@@ -1037,6 +1040,7 @@ transport_fleet.name=Name
 transport_fleet.contact_number=Contact Number
 transport_fleet.owner=Owner
 transport_fleet.transfer_to_owner=Transfer to Another Retail Store Country Center
+transport_fleet.contract=Contract
 transport_fleet.last_update_time=Last Update Time
 transport_fleet.version=Version
 transport_fleet.addTransportTruck=Add Transport Truck

bizcore/WEB-INF/retailscm_core_src/com/doublechaintech/retailscm/RetailscmResources_zh_CN.properties

@@ -756,7 +756,8 @@ supply_order.buyer=\u4E70\u65B9
 supply_order.transfer_to_buyer=\u8F6C\u79FB\u5230\u4E70\u65B9
 supply_order.seller=\u5356\u65B9
 supply_order.transfer_to_seller=\u8F6C\u79FB\u5230\u5356\u65B9
-supply_order.title=\u5934\u8854
+supply_order.title=\u6807\u9898
+supply_order.contract=\u5408\u540C
 supply_order.total_amount=\u603B\u91D1\u989D
 supply_order.last_update_time=\u66F4\u65B0\u4E8E
 supply_order.version=\u7248\u672C
@@ -816,6 +817,7 @@ retail_store_order.seller=\u5356\u65B9
 retail_store_order.transfer_to_seller=\u8F6C\u79FB\u5230\u5356\u65B9
 retail_store_order.title=\u5934\u8854
 retail_store_order.total_amount=\u603B\u91D1\u989D
+retail_store_order.contract=\u5408\u540C
 retail_store_order.last_update_time=\u66F4\u65B0\u4E8E
 retail_store_order.version=\u7248\u672C
 retail_store_order.addRetailStoreOrderLineItem=\u65B0\u589E\u96F6\u552E\u95E8\u5E97\u8BA2\u5355\u884C\u9879\u76EE\u5217\u8868
@@ -875,6 +877,7 @@ warehouse.owner=\u4E1A\u4E3B
 warehouse.transfer_to_owner=\u8F6C\u5230\u8001\u677F
 warehouse.latitude=\u7EAC\u5EA6
 warehouse.longitude=\u7ECF\u5EA6
+warehouse.contract=\u5408\u540C
 warehouse.last_update_time=\u66F4\u65B0\u4E8E
 warehouse.version=\u7248\u672C
 warehouse.addStorageSpace=\u65B0\u589E\u5B58\u50A8\u7A7A\u95F4\u5217\u8868
@@ -1137,6 +1140,7 @@ transport_fleet.name=\u540D\u79F0
 transport_fleet.contact_number=\u8054\u7CFB\u7535\u8BDD
 transport_fleet.owner=\u4E1A\u4E3B
 transport_fleet.transfer_to_owner=\u8F6C\u5230\u8001\u677F
+transport_fleet.contract=\u5408\u540C
 transport_fleet.last_update_time=\u66F4\u65B0\u4E8E
 transport_fleet.version=\u7248\u672C
 transport_fleet.addTransportTruck=\u65B0\u589E\u8FD0\u8F93\u5361\u8F66\u5217\u8868

bizcore/WEB-INF/retailscm_core_src/com/doublechaintech/retailscm/damagespace/DamageSpaceManagerImpl.java

@@ -1001,9 +1001,9 @@ public Object wxappview(RetailscmUserContext userContext, String damageSpaceId)
 				MapUtil.put("id", "7-warehouse")
 				    .put("fieldName", "warehouse")
 				    .put("label", "仓库")
-				    .put("type", "auto")
+				    .put("type", "document")
 				    .put("linkToUrl", "warehouseManager/wxappview/:id/")
-				    .put("displayMode", "{\"brief\":\"contact_number\",\"imageUrl\":\"\",\"name\":\"auto\",\"title\":\"location\",\"imageList\":\"\"}")
+				    .put("displayMode", "{\"brief\":\"contact_number\",\"imageUrl\":\"\",\"name\":\"document\",\"title\":\"location\",\"imageList\":\"\"}")
 				    .into_map()
 		);
 		result.put("warehouse", merchantObj.getWarehouse());

bizcore/WEB-INF/retailscm_core_src/com/doublechaintech/retailscm/goods/GoodsManagerImpl.java

@@ -1889,9 +1889,9 @@ public Object wxappview(RetailscmUserContext userContext, String goodsId) throws
 				MapUtil.put("id", "14-bizOrder")
 				    .put("fieldName", "bizOrder")
 				    .put("label", "订单")
-				    .put("type", "auto")
+				    .put("type", "document")
 				    .put("linkToUrl", "supplyOrderManager/wxappview/:id/")
-				    .put("displayMode", "{\"brief\":\"total_amount\",\"imageUrl\":\"\",\"name\":\"auto\",\"title\":\"title\",\"imageList\":\"\"}")
+				    .put("displayMode", "{\"brief\":\"total_amount\",\"imageUrl\":\"\",\"name\":\"document\",\"title\":\"title\",\"imageList\":\"\"}")
 				    .into_map()
 		);
 		result.put("bizOrder", merchantObj.getBizOrder());
@@ -1900,9 +1900,9 @@ public Object wxappview(RetailscmUserContext userContext, String goodsId) throws
 				MapUtil.put("id", "15-retailStoreOrder")
 				    .put("fieldName", "retailStoreOrder")
 				    .put("label", "生超的订单")
-				    .put("type", "auto")
+				    .put("type", "document")
 				    .put("linkToUrl", "retailStoreOrderManager/wxappview/:id/")
-				    .put("displayMode", "{\"brief\":\"total_amount\",\"imageUrl\":\"\",\"name\":\"auto\",\"title\":\"title\",\"imageList\":\"\"}")
+				    .put("displayMode", "{\"brief\":\"total_amount\",\"imageUrl\":\"\",\"name\":\"document\",\"title\":\"title\",\"imageList\":\"\"}")
 				    .into_map()
 		);
 		result.put("retailStoreOrder", merchantObj.getRetailStoreOrder());

bizcore/WEB-INF/retailscm_core_src/com/doublechaintech/retailscm/goodssupplier/GoodsSupplierGridViewGenerator.java

@@ -23,7 +23,7 @@ protected void throwExceptionIfListNotFount(String listName) {
 			return new String[]{"id","product_name","product_description","product_unit","supplier","version"};
 		}
 		if(GoodsSupplier.SUPPLY_ORDER_LIST.equals(listName)){
-			return new String[]{"id","buyer","seller","title","total_amount","last_update_time","version"};
+			return new String[]{"id","buyer","seller","title","contract","total_amount","last_update_time","version"};
 		}
 		if(GoodsSupplier.ACCOUNT_SET_LIST.equals(listName)){
 			return new String[]{"id","name","year_set","effective_date","accounting_system","domestic_currency_code","domestic_currency_name","opening_bank","account_number","country_center","retail_store","goods_supplier","last_update_time","version"};

bizcore/WEB-INF/retailscm_core_src/com/doublechaintech/retailscm/goodssupplier/GoodsSupplierManager.java

@@ -49,9 +49,9 @@ public interface GoodsSupplierManager extends BaseManager{
 
 	*/
 
-	//public  SupplyOrderManager getSupplyOrderManager(RetailscmUserContext userContext, String goodsSupplierId, String buyerId, String title, BigDecimal totalAmount ,String [] tokensExpr)  throws Exception;
+	//public  SupplyOrderManager getSupplyOrderManager(RetailscmUserContext userContext, String goodsSupplierId, String buyerId, String title, String contract, BigDecimal totalAmount ,String [] tokensExpr)  throws Exception;
 
-	public  GoodsSupplier addSupplyOrder(RetailscmUserContext userContext, String goodsSupplierId, String buyerId, String title, BigDecimal totalAmount , String [] tokensExpr)  throws Exception;
+	public  GoodsSupplier addSupplyOrder(RetailscmUserContext userContext, String goodsSupplierId, String buyerId, String title, String contract, BigDecimal totalAmount , String [] tokensExpr)  throws Exception;
 	public  GoodsSupplier removeSupplyOrder(RetailscmUserContext userContext, String goodsSupplierId, String supplyOrderId, int supplyOrderVersion,String [] tokensExpr)  throws Exception;
 	public  GoodsSupplier updateSupplyOrder(RetailscmUserContext userContext, String goodsSupplierId, String supplyOrderId, int supplyOrderVersion, String property, String newValueExpr,String [] tokensExpr)  throws Exception;