Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/audit/information/entity/Information.java

@@ -91,6 +91,8 @@ public class Information extends DataEntity<Information>  {
 	private String extendedTime;
 	//工作状态
 	private String appendStatus;
+	//结算审定施工费金额（含税价）
+	private Double settlementPrice;
 
 	public String getAppendStatus() {
 		return appendStatus;
@@ -428,6 +430,14 @@ public class Information extends DataEntity<Information>  {
 		this.settlement = settlement;
 	}
 
+	public Double getSettlementPrice() {
+		return settlementPrice;
+	}
+
+	public void setSettlementPrice(Double settlementPrice) {
+		this.settlementPrice = settlementPrice;
+	}
+
 	@Override
 	public String toString() {
 		return "Information{" +

src/main/java/com/jeeplus/modules/sg/audit/information/mapper/xml/InformationMapper.xml

@@ -358,7 +358,8 @@
 		firstFinishDate,
 		secondFinish,
 		secondFinishDate,
-		underCentralized
+		underCentralized,
+		settlementPrice
 		) VALUES
 		<foreach collection="information" item="item" index="index" separator="," >
 		(
@@ -389,7 +390,8 @@
 			#{item.firstFinishDate},
 			#{item.secondFinish},
 			#{item.secondFinishDate},
-			#{item.underCentralized}
+			#{item.underCentralized},
+			#{item.settlementPrice}
             )
 		</foreach>
 	</insert>

src/main/java/com/jeeplus/modules/sg/audit/information/utils/ImportInformation.java

@@ -355,6 +355,20 @@ public  class ImportInformation {
                     Object projectStart = ei.getCellValue(row, 14);
                     Object projectStop = ei.getCellValue(row, 15);
                     Object department = ei.getCellValue(row, 16);
+                    //26 土建审定金额
+                    Object civil = ei.getCellValue(row, 26);
+                    if (civil.equals("")) {
+                        civil = "0.0";
+                    }
+                    //27 安装审定金额
+                    Object installation = ei.getCellValue(row, 27);
+                    if (installation.equals("")) {
+                        installation = "0.0";
+                    }
+
+                    BigDecimal b1 = new BigDecimal(Double.parseDouble(civil.toString()));
+                    BigDecimal b2 = new BigDecimal(Double.parseDouble(installation.toString()));
+                    double settlementPrice = b1.add(b2).doubleValue();
                     Object projectFirm = ei.getCellValue(row, 39);
                     Object subDate = ei.getCellValue(row, 41);
                     Object releaseDate = ei.getCellValue(row, 42);
@@ -397,6 +411,7 @@ public  class ImportInformation {
                         if (!approvalDate.equals("")&&approvalDate!=null) {
                             information.setApprovalDate(simpleDateFormat.parse(approvalDate.toString()));
                         }
+                    information.setSettlementPrice(settlementPrice);
                     information.setSecondUnits(secondUnits.toString());
                     information.setFirstUnits(firstUnits.toString());
                     information.preInsert();

src/main/java/com/jeeplus/modules/sg/financial/expense/entity/Expense.java

@@ -0,0 +1,106 @@
+package com.jeeplus.modules.sg.financial.expense.entity;
+
+import com.jeeplus.core.persistence.ActEntity;
+
+public class Expense extends ActEntity<Expense> {
+    //项目名称
+    private String projectName;
+    //项目定义
+    private String projectId;
+    //项目批次
+    private String projectBatch;
+    //施工费合同折扣
+    private String constructionCost;
+    //设计费合同折扣
+    private String designCost;
+    //设计费典型设计折扣
+    private String designTypeicalCost;
+    //监理费合同折扣
+    private String supervisionCost;
+    //监理费典型折扣
+    private String supervisionTypeicalCost;
+    //发文中设计费金额（不含税）
+    private String documentDesignCost;
+    //发文中监理费金额（不含税）
+    private String documentSupervisionCost;
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getProjectBatch() {
+        return projectBatch;
+    }
+
+    public void setProjectBatch(String projectBatch) {
+        this.projectBatch = projectBatch;
+    }
+
+    public String getConstructionCost() {
+        return constructionCost;
+    }
+
+    public void setConstructionCost(String constructionCost) {
+        this.constructionCost = constructionCost;
+    }
+
+    public String getDesignCost() {
+        return designCost;
+    }
+
+    public void setDesignCost(String designCost) {
+        this.designCost = designCost;
+    }
+
+    public String getDesignTypeicalCost() {
+        return designTypeicalCost;
+    }
+
+    public void setDesignTypeicalCost(String designTypeicalCost) {
+        this.designTypeicalCost = designTypeicalCost;
+    }
+
+    public String getSupervisionCost() {
+        return supervisionCost;
+    }
+
+    public void setSupervisionCost(String supervisionCost) {
+        this.supervisionCost = supervisionCost;
+    }
+
+    public String getSupervisionTypeicalCost() {
+        return supervisionTypeicalCost;
+    }
+
+    public void setSupervisionTypeicalCost(String supervisionTypeicalCost) {
+        this.supervisionTypeicalCost = supervisionTypeicalCost;
+    }
+
+    public String getDocumentDesignCost() {
+        return documentDesignCost;
+    }
+
+    public void setDocumentDesignCost(String documentDesignCost) {
+        this.documentDesignCost = documentDesignCost;
+    }
+
+    public String getDocumentSupervisionCost() {
+        return documentSupervisionCost;
+    }
+
+    public void setDocumentSupervisionCost(String documentSupervisionCost) {
+        this.documentSupervisionCost = documentSupervisionCost;
+    }
+}

src/main/java/com/jeeplus/modules/sg/picking/activiti/mapper/ShowListMapper.java

@@ -95,4 +95,14 @@ public interface ShowListMapper extends BaseMapper<ShowList> {
      * 查询出所有可以领料的id
      */
     List<String> selectAllId();
+
+    /**
+     * 修改项目状态表示开启领料
+     */
+    void updateAcqStatus(ShowList showList);
+
+    /**
+     * 查询是否已经发起过领料
+     * */
+    String findAcqStatus(ShowList showList);
 }

src/main/java/com/jeeplus/modules/sg/picking/activiti/mapper/xml/ShowListMapper.xml

@@ -272,4 +272,12 @@
 		from md_acquisition_process as a
 		where exportStatus = '1'
 	</select>
+	
+	<update id="updateAcqStatus">
+		update xm_project_details set acquisition_status = 1 where id = #{projectId};
+	</update>
+
+	<select id="findAcqStatus" resultType="java.lang.String">
+		select acquisition_status from xm_project_details where id = #{projectId};
+	</select>
 </mapper>

src/main/java/com/jeeplus/modules/sg/picking/activiti/service/ShowListService.java

@@ -131,4 +131,13 @@ public class ShowListService extends CrudService<ShowListMapper, ShowList> {
 	public List<String> selectAllId() {
 		return showListMapper.selectAllId();
 	}
+
+	@Transactional(readOnly = false)
+	public void updateAcqStatus(ShowList showList) {
+		showListMapper.updateAcqStatus(showList);
+	}
+
+	public String findAcqStatus(ShowList showList) {
+		return showListMapper.findAcqStatus(showList);
+	}
 }

src/main/java/com/jeeplus/modules/sg/picking/activiti/web/PickIngController.java

@@ -351,13 +351,19 @@ public class PickIngController extends BaseController {
                 showList.setsVersion(value);
             }
             //新增或编辑表单保存
-            showListService.save(showList);//保存
+//            showListService.save(showList);//保存
+            //查询项目的领料状态是否不为0
+            String acqStatus = showListService.findAcqStatus(showList);
+            if ("0".equals(acqStatus)) {
+                showListService.updateAcqStatus(showList);
+            }
+            //修改项目的状态
             // 启动流程
-            Map<String, Object> vars = Maps.newHashMap();
+/*            Map<String, Object> vars = Maps.newHashMap();
             vars.put("manager", UserUtils.getUser().getLoginName());
             ProcessDefinition p = actProcessService.getProcessDefinition(showList.getAct().getProcDefId());
             String title = showList.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
-            actTaskService.startProcess(p.getKey(), "md_acquisition_process", showList.getId(), title, vars);
+            actTaskService.startProcess(p.getKey(), "md_acquisition_process", showList.getId(), title, vars);*/
             j.setMsg("发起领料流程成功!");
             j.getBody().put("targetUrl", "/act/task/process/");