2022/7/2 材料库提交

src/main/java/com/jeeplus/modules/projectmaterialstorage/dao/ProjectMaterialStorageDao.java

@@ -4,6 +4,7 @@ package com.jeeplus.modules.projectmaterialstorage.dao;
 
 import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
+import com.jeeplus.modules.project.entity.Project;
 import com.jeeplus.modules.projectmaterialstorage.entity.ProjectMaterialStorage;
 
 
@@ -14,5 +15,5 @@ import com.jeeplus.modules.projectmaterialstorage.entity.ProjectMaterialStorage;
 public interface ProjectMaterialStorageDao extends CrudDao<ProjectMaterialStorage> {
 
 
-
+    public String getProjectName(ProjectMaterialStorage projectMaterialStorage);
 }

src/main/java/com/jeeplus/modules/projectmaterialstorage/service/ProjectMaterialStorageService.java

@@ -57,4 +57,11 @@ public class ProjectMaterialStorageService extends CrudService<ProjectMaterialSt
     public Integer update(ProjectMaterialStorage projectMaterialStorage){
        return projectMaterialStorageDao.update(projectMaterialStorage);
     }
+
+    /**
+     * 获取项目名字
+     */
+    public  String getProjectName(ProjectMaterialStorage projectMaterialStorage){
+       return projectMaterialStorageDao.getProjectName(projectMaterialStorage);
+    }
 }

src/main/java/com/jeeplus/modules/projectmaterialstorage/web/ProjectMaterialStorageController.java

@@ -87,7 +87,7 @@ public class ProjectMaterialStorageController extends BaseController {
 
 //        projectNumber update_by  update_date create_by create_date
         if(projectMaterialStorage.getProjectNumber()==null && projectMaterialStorage.getMaterialName() ==null  ){
-            addMessage(redirectAttributes, "上传失败，请重试");
+            addMessage(redirectAttributes, "添加失败失败，请重试");
             return "redirect:"+Global.getAdminPath()+"/project/projectMaterialStorage/?repage";
         }
         projectMaterialStorage.setIsNewRecord(true);
@@ -123,7 +123,6 @@ public class ProjectMaterialStorageController extends BaseController {
     /**
      * 删除材料库
      */
-    @RequiresPermissions("project:projectMaterialStorage:del")
     @RequestMapping(value = "delete")
     public String delete(ProjectMaterialStorage projectMaterialStorage, RedirectAttributes redirectAttributes) {
 
@@ -225,10 +224,15 @@ public class ProjectMaterialStorageController extends BaseController {
             model.addAttribute("projectMaterialStorage", projectMaterialStorage1);
             return "modules/projectMaterialStorage/projectMaterialStorageTwoForm";
         }
+        if(StringUtils.isNotBlank(projectMaterialStorage.getProjectNumber())){
+            ProjectMaterialStorage projectMaterialStorage2 = projectMaterialStorageService.get(projectMaterialStorage.getId());
+            model.addAttribute("projectMaterialStorage", projectMaterialStorage2);
+        }
         model.addAttribute("projectMaterialStorage", projectMaterialStorage);
 
         return "modules/projectMaterialStorage/projectMaterialStorageTwoForm";
     }
 
 
+
 }

src/main/resources/mappings/modules/projectMaterialStorage/ProjectMaterialStorageDao.xml

@@ -12,7 +12,9 @@
 		a.update_by AS "updateBy.id",
 		a.update_date AS "updateDate",
 		a.remarks AS "remarks",
-		a.del_flag AS "delFlag"
+		a.del_flag AS "delFlag",
+		r.project_name as "projectName",
+		a.unit as "unit"
 	</sql>
 
 	<sql id="projectJoins">
@@ -32,16 +34,17 @@
 		SELECT
 			<include refid="projectMaterialStorageColumns"/>
 		FROM project_material_storage a
+		left join rural_project_records r on a.project_number = r.id
 <!--		<include refid="projectJoins"/>-->
 		WHERE a.id = #{id}
 	</select>
 
 	<select id="findList" resultType="com.jeeplus.modules.projectmaterialstorage.entity.ProjectMaterialStorage" >
 		SELECT
-		a.id,a.material_name,a.price,a.create_date as createDate,r.project_name,sys_area.name as 'areaName',a.project_number as 'projectNumber',a.unit as 'unit'
+		a.id,a.material_name,a.price,a.create_date as createDate,r.project_name,sys_area.name as 'areaName',a.project_number as 'projectNumber',a.unit as 'unit',r.project_id as 'projectId'
 		FROM project_material_storage a
 		left join rural_project_records as r
-		on a.project_number = r.project_id
+		on a.project_number = r.id
 		LEFT JOIN sys_area
 		on sys_area.id = r.area_id
 		<where>
@@ -107,7 +110,8 @@
 			project_number,
 			update_by,
 			update_date,
-			create_by
+			create_by,
+			unit
 		) VALUES (
 			#{id},
 			#{createDate},
@@ -118,7 +122,8 @@
 			#{projectNumber},
 			#{updateBy.id},
 			#{updateDate},
-			#{createBy.id}
+			#{createBy.id},
+			#{unit}
 		)
 	</insert>
 
@@ -148,7 +153,12 @@
 		WHERE id = #{id}
 	</update>
 
-
+	<select id="getProjectName" resultType="string">
+		select DISTINCT(r.project_name)
+		 from project_material_storage s left join rural_project_records r
+		 on s.project_number = r.id
+		 where s.project_number = #{projectNumber}
+	</select>
 
 
 

src/main/webapp/webpage/modules/projectMaterialStorage/projectMaterialStorageList.jsp

@@ -408,7 +408,7 @@
             ,cols: [[
 				{checkbox: true, fixed: true},
                 {field:'index',align:'center', title: '序号',width:55}
-				,{field:'projectNumber',align:'center', title: '报告号',  width:150}
+				,{field:'projectId',align:'center', title: '报告号',  width:150}
 				,{field:'materialName',align:'center', title: '材料名称',  width:150}
 				,{field:'unit',align:'center', title: '单位',  width:80}
 				,{field:'price',align:'center', title: '价格',  width:150}
@@ -431,8 +431,6 @@
                 ,{field:'op',align:'center',title:"操作",width:240,templet:function(d){
                         ////对操作进行初始化
                         var xml="<div class=\"layui-btn-group\">";
-
-
                          xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/project/projectMaterialStorage/formTwoPage?id=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
 						 xml+="<a href=\"${ctx}/project/projectMaterialStorage/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该材料信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
 
@@ -450,7 +448,7 @@
                 {
                     "index":"${index.index+1}"
                     ,"id":"${projectMaterialStorage.id}"
-					,"projectNumber":"${projectMaterialStorage.projectNumber}"
+					,"projectId":"${projectMaterialStorage.projectId}"
 					,"unit":"${projectMaterialStorage.unit}"
 					,"materialName":"${projectMaterialStorage.materialName}"
 					,"price":"${projectMaterialStorage.price}"

src/main/webapp/webpage/modules/projectMaterialStorage/projectMaterialStorageTwoForm.jsp

@@ -93,26 +93,26 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>项目名称</label>
 					<div class="layui-input-block">
-						<sys:gridselectprojectmaterial url="${ctx}/workinvoiceTwo/workinvoiceTwo/selectproject" id="project" name="projectId"  value="${ruralProjectRecords.id}"  title="选择所属项目" labelName="projectName" cssStyle="background-color: #fff"
-													  labelValue="${ruralProjectRecords.projectName}" cssClass="form-control required layui-input" fieldLabels="项目名称" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName"></sys:gridselectprojectmaterial>
+						<sys:gridselectprojectmaterial url="${ctx}/workinvoiceTwo/workinvoiceTwo/selectproject" id="project" name="projectNumber"  value="${projectMaterialStorage.projectName}"  title="选择所属项目" labelName="projectName" cssStyle="background-color: #fff"
+													  labelValue="${projectMaterialStorage.projectName}" cssClass="form-control required layui-input" fieldLabels="项目名称" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName"  ></sys:gridselectprojectmaterial>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>材料名称</label>
 					<div class="layui-input-block">
-						<form:input id="materialName" path="materialName" htmlEscape="false"  placeholder="请输入材料名称"  class="form-control layui-input"/>
+						<form:input id="materialName" path="materialName" htmlEscape="false"  placeholder="请输入材料名称"  class="form-control layui-input"  value="${projectMaterialStorage.materialName}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item invoicetype">*</span>材料单位</label>
+					<label class="layui-form-label"><span class="require-item invoicetype" >*</span>材料单位</label>
 					<div class="layui-input-block">
-						<form:input id="unit" path="unit" htmlEscape="false"  placeholder="请输入材料单位"  class="form-control layui-input"/>
+						<form:input id="unit" path="unit" htmlEscape="false"  placeholder="请输入材料单位"  class="form-control layui-input" value="${projectMaterialStorage.unit}" />
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>单价(元)</label>
 					<div class="layui-input-block">
-						<form:input id="price" path="price" htmlEscape="false"  placeholder="请输入单价"  class="form-control layui-input"/>
+						<form:input id="price" path="price" htmlEscape="false"  placeholder="请输入单价"  class="form-control layui-input"  value="${projectMaterialStorage.price}"/>
 					</div>
 				</div>