Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java =================================================================== diff -u -r24654 -r25658 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 24654) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 25658) @@ -275,6 +275,7 @@ jsonobj.put("amount", tousseItem.getAmount()); jsonobj.put("includeImplant", ""); jsonobj.put("price", td.getPrice() == null ? 0 : td.getPrice()); + jsonobj.put("weight", td.getWeight()); jsonobj.put("type", "tousse"); jsonobj.put("uiProvider", "col"); jsonobj.put("cls", "master-task"); Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r25611 -r25658 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 25611) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 25658) @@ -499,6 +499,7 @@ String oldSupplierName = obj.optString("oldSupplierName"); String supplierName = obj.optString("supplierName"); Double price = obj.optDouble("price"); + Double weight = obj.optDouble("weight"); String recyclingStatus = obj.optString("recyclingStatus"); String imageFileIds = obj.optString("imageFileIds"); Long appid = foreignTousseApplication.getId(); @@ -628,6 +629,7 @@ tousseDefinition = newForeignTousseDefinition(config,cleanedEntirely, obj, tousseName, supplierName, appid,false,materialNameToWashClassifyTypeMap); } tousseDefinition.setPrice(price == 0 ? config.getForeignToussePrice() : price); + tousseDefinition.setWeight(weight); tousseDefinition.setDiscountPrice(tousseDefinition.getPrice()); //申请单上新添加的包定义 创建一个祖先类包定义