Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java =================================================================== diff -u -r23943 -r24925 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 23943) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 24925) @@ -2,6 +2,7 @@ import java.io.IOException; import java.io.PrintWriter; +import java.io.UnsupportedEncodingException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; @@ -147,10 +148,8 @@ private OrgUnitManager orgUnitManager; private WareHouseManager wareHouseManager; - -// private InvoiceManager invoiceManager; - + public void setWareHouseManager(WareHouseManager wareHouseManager) { this.wareHouseManager = wareHouseManager; } @@ -311,7 +310,7 @@ */ private List getTousseItemVos() { String appGoodsStr = StrutsParamUtils.getRequest().getParameter("tousseInstanceIds"); - String tousseInstanceInfos = StrutsParamUtils.getRequest().getParameter("tousseInstanceInfos"); + String tousseInstanceInfos= StrutsParamUtils.getRequest().getParameter("tousseInstanceInfos"); List vos = new ArrayList(); if (StringUtils.isNotBlank(tousseInstanceInfos)) { Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java =================================================================== diff -u -r24021 -r24925 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java (.../RecyclingApplicationManager.java) (revision 24021) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java (.../RecyclingApplicationManager.java) (revision 24925) @@ -81,7 +81,7 @@ /** * 保存或者更新申请单. * @param recyclingApplication 申请单对象 - * @param isCommit 是否提交 + * @param isCommit 是否提交。是:点击的是提交按钮;否:点击的是暂存按钮 */ public void saveOrUpdateRecyclingApplication( RecyclingApplication recyclingApplication,Boolean isCommit); Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/controller/RecyclingApplicationController.java =================================================================== diff -u -r24740 -r24925 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/controller/RecyclingApplicationController.java (.../RecyclingApplicationController.java) (revision 24740) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/controller/RecyclingApplicationController.java (.../RecyclingApplicationController.java) (revision 24925) @@ -19,6 +19,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; import com.forgon.databaseadapter.service.DateQueryAdapter; import com.forgon.directory.acegi.tools.AcegiHelper; @@ -30,8 +31,10 @@ import com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication; +import com.forgon.disinfectsystem.recyclingapplication.service.InvoicePlanManager; import com.forgon.disinfectsystem.recyclingapplication.service.ReAppTableSqlHandler; import com.forgon.disinfectsystem.recyclingapplication.service.RecyclingApplicationManager; +import com.forgon.disinfectsystem.vo.ApplicationItemVO; import com.forgon.tools.SqlBuilder; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; @@ -65,6 +68,8 @@ @Autowired private ObjectDao objectDao; + @Autowired + private InvoicePlanManager invoicePlanManager; /** * 默认每页查询数量为20 */ @@ -218,4 +223,37 @@ public void terminateMultiInvoicePlans(){ } + + /** + * 根据申请单ID获取申请物品申请发货等信息 + * */ + @RequestMapping(value="/findApplicationItemVOListByInvoicePlanId") + @ResponseBody + public String findApplicationItemVOListByInvoicePlanId(String id){ + JSONObject result = new JSONObject(); + if(StringUtils.isBlank(id)){ + JSONUtil.addMessage(result, "输入参数id不能为空"); + SpringUtils.output(result); + return result.toString(); + } + + if(!DatabaseUtil.isPoIdValid(id)){ + JSONUtil.addMessage(result, "输入参数id非法,只能是正整数"); + SpringUtils.output(result); + return result.toString(); + } + + List items = invoicePlanManager.findApplicationItemVOListByInvoicePlanId(id); + if(items.size() == 0){ + JSONUtil.addMessage(result, "根据输入参数id未找到相应的申请单对象"); + SpringUtils.output(result); + return result.toString(); + } + + result.put(JSONUtil.JSON_KEY_TOTAL, items.size()); + result.put(JSONUtil.JSON_KEY_SUCCESS, true); + result.put(JSONUtil.JSON_KEY_ROWS, JSONArray.fromObject(items).toString()); + return result.toString(); + } + } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/controller/InvoicePlanController.java =================================================================== diff -u -r24387 -r24925 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/controller/InvoicePlanController.java (.../InvoicePlanController.java) (revision 24387) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/controller/InvoicePlanController.java (.../InvoicePlanController.java) (revision 24925) @@ -10,6 +10,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; + import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; @@ -23,6 +26,7 @@ import com.forgon.disinfectsystem.recyclingapplication.vo.InvoicePlanVo; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; import com.forgon.disinfectsystem.tousseitem.service.TousseItemManager; +import com.forgon.disinfectsystem.vo.ApplicationItemVO; import com.forgon.serialnumber.service.SerialNumManager; import com.forgon.systemsetting.service.HttpOptionManager; import com.forgon.tools.hibernate.ObjectDao; @@ -37,7 +41,7 @@ @RequestMapping(value ="/disinfectSystem/invoicePlan/invoicePlanController", produces = "application/json;charset=UTF-8") public class InvoicePlanController { Logger logger = Logger.getLogger(this.getClass()); - + @Autowired private BarcodeManager barcodeManager; @Autowired @@ -75,6 +79,7 @@ return response; } + private void setSentState(List vos){ if(CollectionUtils.isEmpty(vos)){ return; @@ -101,4 +106,8 @@ } } } + + + + }