|
|
@@ -1,6 +1,7 @@
|
|
|
package com.jeeplus.modules.sg.picking.activiti.web;
|
|
|
|
|
|
import com.google.common.collect.Maps;
|
|
|
+import com.jeeplus.common.config.Global;
|
|
|
import com.jeeplus.common.json.AjaxJson;
|
|
|
import com.jeeplus.common.utils.DateUtils;
|
|
|
import com.jeeplus.common.utils.StringUtils;
|
|
|
@@ -16,6 +17,7 @@ import com.jeeplus.modules.sg.audit.information.entity.OutInformation;
|
|
|
import com.jeeplus.modules.sg.audit.material.entity.Material;
|
|
|
import com.jeeplus.modules.sg.financial.erpcredit.util.ExportUtil;
|
|
|
import com.jeeplus.modules.sg.managementcenter.activiti.entity.FindTask;
|
|
|
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
|
|
|
import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
|
|
|
import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
|
|
|
import com.jeeplus.modules.sg.managementcenter.materialInventory.entity.MaterialInventory;
|
|
|
@@ -216,6 +218,14 @@ public class PickIngController extends BaseController {
|
|
|
@RequestMapping(value = "pickPicData")
|
|
|
public Map<String, Object> pickPicData(PickIng pickIng, HttpServletRequest request, HttpServletResponse response, Model model) {
|
|
|
Page<PickIng> page = showListService.findNewImgPage(new Page<PickIng>(request, response), pickIng);
|
|
|
+ //当判定系统为linux的时候
|
|
|
+ if (Global.SYS_TYPE.equals("2")) {
|
|
|
+ List<PickIng> list = page.getList();
|
|
|
+ for (PickIng upload:
|
|
|
+ list) {
|
|
|
+ upload.setMdImg("http://" + request.getServerName() +upload.getMdImg());
|
|
|
+ }
|
|
|
+ }
|
|
|
return getBootstrapData(page);
|
|
|
}
|
|
|
|
yue