入库状态显示

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/entity/ProgressSchedule.java

@@ -39,6 +39,10 @@ public class ProgressSchedule extends DataEntity<ProgressSchedule> {
      * */
     private String jointDrawing;
 
+    //添加入库状态 0-入库前 1-已入库 2-入库退回 3-入库退回再入库
+    private String addWareHousing;
+
+
     public String getProjectName() {
         return projectName;
     }
@@ -102,4 +106,12 @@ public class ProgressSchedule extends DataEntity<ProgressSchedule> {
     public void setJointDrawing(String jointDrawing) {
         this.jointDrawing = jointDrawing;
     }
+
+    public String getAddWareHousing() {
+        return addWareHousing;
+    }
+
+    public void setAddWareHousing(String addWareHousing) {
+        this.addWareHousing = addWareHousing;
+    }
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/mapper/xml/ProgressScheduleMapper.xml

@@ -17,11 +17,13 @@
         b.designUpload,
         b.drawingReview,
         b.estimate,
-        b.jointDrawing
+        b.jointDrawing,
+        c.addWareHousing
     </sql>
 
     <sql id="personnelJoinColumns">
         left join cb_progress_schedule b on a.projectReserveId = b.projectReserveId
+        left join cb_personnel_turnover c on a.projectReserveId = c.projectReserveId
     </sql>
 
 

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/service/ProgressScheduleService.java

@@ -109,7 +109,7 @@ public class ProgressScheduleService extends CrudService<ProgressScheduleMapper,
         }
         String addWareHousing = byReserveId.getAddWareHousing();
         if (!"0".equals(addWareHousing)) {
-            turnoverMapper.updateAddWareHousingStatus(projectReserveId,"3");
+            turnoverMapper.updateAddWareHousingStatus(projectReserveId,"2");
         }
         // 重置年度物资上报统计/明细，
         materialInfoMapper.deleteByPro(projectName);

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/service/ReserveProcessService.java

@@ -319,7 +319,7 @@ public class ReserveProcessService extends CrudService<ReserveProcessMapper, Res
             if ("0".equals(addWareHousing)) {
                 personnelTurnoverMapper.updateAddWareHousingStatus(projectReserveId, "1");
             } else {
-                personnelTurnoverMapper.updateAddWareHousingStatus(projectReserveId, "4");
+                personnelTurnoverMapper.updateAddWareHousingStatus(projectReserveId, "3");
             }
             //修改项目甲供材清册状态
             personnelTurnoverMapper.updateMaterialStatus(projectReserveId, "2");

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/web/ProgressScheduleController.java

@@ -13,6 +13,7 @@ import com.jeeplus.modules.act.service.ActProcessService;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.filing.basicInformation.entity.BasicInformation;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
+import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.PersonnelTurnover;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ProgressSchedule;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ReserveProcess;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.service.ProgressScheduleService;
@@ -84,6 +85,25 @@ public class ProgressScheduleController extends BaseController {
     @RequestMapping(value = "data")
     public Map<String, Object> basicData(ProgressSchedule progressSchedule, HttpServletRequest request, HttpServletResponse response, Model model) {
         Page<ProgressSchedule> page = service.findPage(new Page<ProgressSchedule>(request, response), progressSchedule);
+        List<ProgressSchedule> list = page.getList();
+        for (ProgressSchedule p :
+                list) {
+            String addWareHousing = p.getAddWareHousing();
+            if (null != addWareHousing && !"".equals(addWareHousing)) {
+                if ("0".equals(addWareHousing)) {
+                    p.setAddWareHousing("入库前");
+                }
+                if ("1".equals(addWareHousing)) {
+                    p.setAddWareHousing("已入库");
+                }
+                if ("2".equals(addWareHousing)) {
+                    p.setAddWareHousing("入库退回");
+                }
+                if ("3".equals(addWareHousing)) {
+                    p.setAddWareHousing("入库退回再入库");
+                }
+            }
+        }
         return getBootstrapData(page);
     }
 

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/progressScheduleList.js

@@ -87,6 +87,10 @@ $(document).ready(function () {
         },{
             field: 'jointDrawing',
             title: '联合审图（完成时间）',
+        },{
+            field: 'addWareHousing',
+            width:100,
+            title: '入库状态',
         }
         ]
     });