采购审批、合同审批、采购订单修改

src/main/contract/com/yw/contract/common/sync/mes/MesCommonHelper.java

@@ -289,6 +289,7 @@ public class MesCommonHelper  extends MesHelper{
         dats.put("vendorCode", contractPurchaseOrder.getSupplierCode()); 
         dats.put("vendorName", contractPurchaseOrder.getSupplierName()); 
         dats.put("contractNumber", contractPurchaseOrder.getContractNumber());
+        dats.put("applyCode", contractPurchaseOrder.getPurchaseNumber());
         dats.put("status", "CONFIRMED"); 
         dats.put("fromSys", "oa");
         
@@ -338,7 +339,8 @@ public class MesCommonHelper  extends MesHelper{
     public JSONObject updatePurchaseContractForOrder(ContractPurchaseOrder contractPurchaseOrder) throws Exception {
         Map<String, Object> dats = new HashMap<>();
         dats.put("purchaseCode", contractPurchaseOrder.getOrderNumber());  
-        dats.put("contractNumber", contractPurchaseOrder.getContractNumber());   
+        dats.put("contractNumber", contractPurchaseOrder.getContractNumber());
+        dats.put("applyCode", contractPurchaseOrder.getPurchaseNumber());
         Request request = postRequest(SyncConstant.UPDATEPURCONSTRACT_URL, dats);
         try {
             OkHttpClient client = new OkHttpClient().newBuilder().build();

src/main/contract/com/yw/contract/contract/dao/ContractEntryDaoImpl.java

@@ -32,10 +32,10 @@ public class ContractEntryDaoImpl extends BaseDao implements ContractEntryDao {
 	public List<ContractInfo> contractEntryList(int p, int pSize, ParameterHelper ph, ContractInfo info, IAppSession oasession) throws Exception {
 		StringBuffer sb = new StringBuffer("SELECT ec.universalid, ec.contract_number,ec.firstparty_name,ec.secondparty_name,ec.contract_name,ec.contract_type,ec.contract_signdate,"
 				+ " ec.contract_type,tu1.name AS duty_man_name,tu2.name AS salesman_name," + "tg.GROUPNAME AS duty_department_name ,ed.dname AS contract_type_name, ec.au_state, ec.flow_id,"
-				+ " ec.execute_state,ec.supplier_code,ec.supplier_name,ec.l_form_ins_id,ec.l_form_ins_id,ec.flow_ins_id, ec.is_valid,ec.process_id,ec.contract_entrying_date "
+				+ " ec.execute_state,ec.supplier_code,ec.supplier_name,ec.l_form_ins_id,ec.l_form_ins_id,ec.flow_ins_id, ec.is_valid,ec.process_id,ec.contract_entrying_date,ec.purchase_id,ec.purchase_number "
 				+ " FROM contract ec LEFT JOIN t_user tu1 ON ec.duty_man=tu1.UNIVERSALID " + "LEFT JOIN t_user tu2 ON ec.salesman=tu2.UNIVERSALID "
-				+ "LEFT JOIN t_group tg ON ec.duty_department=tg.UNIVERSALID " + "LEFT JOIN contract_data_dictionary ed ON ec.contract_type=ed.dvalue "
-				+ "AND ed.parentid = (SELECT universalid FROM contract_data_dictionary WHERE dvalue = '" + ContractConstant.CONTRACT_TYPE + "' AND group_root_id=" + oasession.getUnit().getId() + ")"
+				+ " LEFT JOIN t_group tg ON ec.duty_department=tg.UNIVERSALID " + "LEFT JOIN contract_data_dictionary ed ON ec.contract_type=ed.dvalue "
+				+ " AND ed.parentid = (SELECT universalid FROM contract_data_dictionary WHERE dvalue = '" + ContractConstant.CONTRACT_TYPE + "' AND group_root_id=" + oasession.getUnit().getId() + ")"
 				+ " AND ed.is_valid = '1' " + "WHERE ec.contract_status='0' AND ec.isdraft = '0'  AND ec.unit_id=" + oasession.getUnit().getId());
 		sb.append(whereListSql(ph));
 		// String sql="SELECT ec.universalid,
@@ -331,6 +331,8 @@ public class ContractEntryDaoImpl extends BaseDao implements ContractEntryDao {
 				info.setSalesmanSign(rs.getString("salesman_sign"));
 				info.setOtherFile(rs.getString("other_file"));
 				info.setFlowInsId(rs.getLong("flow_ins_id"));
+				info.setPurchaseId(rs.getLong("purchase_id"));
+				info.setPurchaseNumber(rs.getString("purchase_number"));
 				return info;
 			}
 		};

src/main/contract/com/yw/contract/contract/model/ContractInfo.java

@@ -228,6 +228,12 @@ public class ContractInfo {
 	@Column(name="other_file",type=Types.VARCHAR)
 	private String otherFile;	//合同其它材料
 	
+	@Column(name="purchase_id",type=Types.BIGINT)
+	private Long purchaseId;			//采购申请单ID
+	
+	@Column(name="purchase_number",type=Types.VARCHAR)
+	private String purchaseNumber;		//采购申请单编号
+	
 	private String seTache;
 	
 	public Long getUnit_id() {
@@ -710,4 +716,17 @@ public class ContractInfo {
 	public void setOtherFile(String otherFile) {
 		this.otherFile = otherFile;
 	}
+	public Long getPurchaseId() {
+		return purchaseId;
+	}
+	public void setPurchaseId(Long purchaseId) {
+		this.purchaseId = purchaseId;
+	}
+	public String getPurchaseNumber() {
+		return purchaseNumber;
+	}
+	public void setPurchaseNumber(String purchaseNumber) {
+		this.purchaseNumber = purchaseNumber;
+	}
+	
 }

src/main/contract/com/yw/contract/contract/service/ContractPurchaseOrderServiceImpl.java

@@ -333,6 +333,8 @@ public class ContractPurchaseOrderServiceImpl implements ContractPurchaseOrderSe
 		contractPurchaseOrder.setSyncStatus(0);
 		contractPurchaseOrder.setCreateTime(new Date());
 		contractPurchaseOrder.setPurchaseOrderDetails(contractPurchaseOrderDetailList);
+		contractPurchaseOrder.setPurchaseId(contractInfo.getPurchaseId());
+		contractPurchaseOrder.setPurchaseNumber(contractInfo.getPurchaseNumber());
 		int num = addContractPurchaseOrder(contractPurchaseOrder);
 		return num;
 	} 

src/main/webapp/yw/contract/contractFlowCustom/js/contract.js

@@ -16,7 +16,7 @@
 		$(cloneObj).find("input.itemCode").attr("name", "contractMaterialList[" + index + "].itemCode").val(row.itemCode);
 		$(cloneObj).find("input.itemName").attr("name", "contractMaterialList[" + index + "].itemName").val(row.itemName);
 		$(cloneObj).find("input.specification").attr("name", "contractMaterialList[" + index + "].specification").val(row.specification); 
-		$(cloneObj).find("input.qty").attr("name", "contractMaterialList[" + index + "].qty").val(0);
+		$(cloneObj).find("input.qty").attr("name", "contractMaterialList[" + index + "].qty").val(row.qty || 0);
 		$(cloneObj).find("input.price").attr("name", "contractMaterialList[" + index + "].price").val(0);
 		$(cloneObj).find("input.cess").attr("name", "contractMaterialList[" + index + "].cess").val(0); 
 		$(cloneObj).find("input.measureName").attr("name", "contractMaterialList[" + index + "].measureName").val(row.measureName);
@@ -174,12 +174,28 @@ function material_search(){
 
 //选择物料确定 
 function f_importOKMaterial(item, dialog) { 
+	var obj = window.top;
+	var purchaseIdOld = $("#purchaseId").val() || "";
+	var purchaseNumberOld = $("#purchaseNumber").val() || "";
 	var rows = dialog.frame.f_select();
-	if (rows.length == 0) {
-		var obj = window.top;
+	if (rows.length == 0) { 
 		obj.$.ligerDialog.warn('请选择物料！');
 		return;
 	}
+	var purchaseIdNew = rows[0].purchaseId  || "";
+	var purchaseNumberNew = rows[0].purchaseNumber || "";
+	console.log(purchaseIdOld,"purchaseIdOld")
+	console.log(purchaseIdNew,"purchaseIdNew")
+	if($(".startTr1").not(".hide").length > 0){
+		if(purchaseIdOld != purchaseIdNew){
+			obj.$.ligerDialog.warn('原有物料采购信息与新物料采购信息不一致！');
+			return;
+		}
+	}
+	if(rows[0].purchaseId){
+		$("#purchaseId").val(rows[0].purchaseId);
+		$("#purchaseNumber").val(rows[0].purchaseNumber);
+	} 
 	for (var i = 0; i < rows.length; i++) {
 		addMaterial(i, rows[i]);
 	}

src/main/webapp/yw/contract/contractFlowCustom/processContract.jsp

@@ -81,6 +81,11 @@
                     if (yes == true) {
                         obj.remove();
                         addMaterialIdAndName(); 
+                     	// 检查物料行是否为空
+                        if ($(".startTr1").not(".hide").length === 0) {
+                            $("#purchaseId").val('');
+                            $("#purchaseNumber").val('');
+                        }
                     }
                 });
             });
@@ -721,6 +726,8 @@
                 </tr>
             </c:forEach>
             <tr id="firstPoint"></tr> 
+            <input id="purchaseId" name="contractInfo.purchaseId" type="hidden" value="${contractInfo.purchaseId }"/> 
+			<input id="purchaseNumber" name="contractInfo.purchaseNumber" type="hidden" value="${contractInfo.purchaseNumber }"/> 
         </table>
     </div> 
     

src/main/webapp/yw/contract/contractFlowCustom/startContract.jsp

@@ -48,6 +48,11 @@
                     if (yes == true) {
                         obj.remove();
                         addMaterialIdAndName(); 
+                     	// 检查物料行是否为空
+                        if ($(".startTr1").not(".hide").length === 0) {
+                            $("#purchaseId").val('');
+                            $("#purchaseNumber").val('');
+                        }
                     }
                 });
             });
@@ -336,7 +341,8 @@
             </tr>
 
             <tr id="firstPoint"></tr> 
-
+			<input id="purchaseId" name="contractInfo.purchaseId" type="hidden" value="${contractInfo.purchaseId }"/> 
+			<input id="purchaseNumber" name="contractInfo.purchaseNumber" type="hidden" value="${contractInfo.purchaseNumber }"/> 
         </table>
     </div> 
     

src/main/webapp/yw/contract/contractPurchaseOrder/createPurchaseOrder.jsp

@@ -152,7 +152,9 @@ body {
 								<input type="text" readonly="readonly" id="contractNumber" name="contractPurchaseOrder.contractNumber">
 								<input type="hidden" id="contractName" name="contractPurchaseOrder.contractName" value="">
 								<img id="searchContract" class="fee" onClick="selectContract()" src="${pageContext.request.contextPath}/images/sousuo.png" style="height: 20px; width: 20px; cursor: pointer;">
-								<input id="clearContractBtn" name="clearContractBtn" type="button" class="button_fj" value="清除" onclick="clearContract()"/>		
+								<input id="clearContractBtn" name="clearContractBtn" type="button" class="button_fj" value="清除" onclick="clearContract()"/>	
+								<input type="hidden" id="purchaseId" name="contractPurchaseOrder.purchaseId" value="" />
+				                <input type="hidden" id="purchaseNumber" name="contractPurchaseOrder.purchaseNumber" value=""/> 	
 							</td>  
 				        </tr> 
 						<tr>  

src/main/webapp/yw/contract/contractPurchaseOrder/editPurchaseOrder.jsp

@@ -151,6 +151,8 @@ body {
 								<input type="hidden" id="contractName" name="contractPurchaseOrder.contractName" value="${contractPurchaseOrder.contractName }">
 								<img id="searchContract" class="fee" onClick="selectContract()" src="${pageContext.request.contextPath}/images/sousuo.png" style="height: 20px; width: 20px; cursor: pointer;">
 								<input id="clearContractBtn" name="clearContractBtn" type="button" class="button_fj" value="清除" onclick="clearContract()"/>
+								<input type="hidden" id="purchaseId" name="contractPurchaseOrder.purchaseId" value="${contractPurchaseOrder.purchaseId }" /> 
+				                <input type="hidden" id="purchaseNumber" name="contractPurchaseOrder.purchaseNumber" value="${contractPurchaseOrder.purchaseNumber }"/> 
 							</td> 
 				        </tr> 
 						<tr>  

src/main/webapp/yw/contract/contractPurchaseOrder/infoPurchaseOrder.jsp

@@ -143,6 +143,8 @@ body {
 												<input type="hidden" id="contractName" name="contractPurchaseOrder.contractName" value="${contractPurchaseOrder.contractName }">
 												<img id="searchContract" class="fee" onClick="selectContract()" src="${pageContext.request.contextPath}/images/sousuo.png" style="height: 20px; width: 20px; cursor: pointer;">
 												<input id="clearContractBtn" name="clearContractBtn" type="button" class="button_fj" value="清除" onclick="clearContract()"/>
+												<input type="hidden" id="purchaseId" name="contractPurchaseOrder.purchaseId" value="${contractPurchaseOrder.purchaseId }" /> 
+				                				<input type="hidden" id="purchaseNumber" name="contractPurchaseOrder.purchaseNumber" value="${contractPurchaseOrder.purchaseNumber }"/> 
 						                    </c:when>
 						                    <c:otherwise>
 						                    	${contractPurchaseOrder.contractNumber } 

src/main/webapp/yw/contract/contractPurchaseOrder/js/purchaseOrder.js

@@ -55,6 +55,8 @@ function f_ContractOK(item, dialog){
 	$("#contractName").val(rows[0].contract_name);  
 	$("#supplierCode").val(rows[0].supplierCode);
 	$("#supplierName").val(rows[0].supplierName);
+	$("#purchaseId").val(rows[0].purchaseId);
+	$("#purchaseNumber").val(rows[0].purchaseNumber);
 	var task = $("#task").val(); 
 	if(contractId_before!=contractId_after && (task == 'create' || task == 'edit')){
 		$(".startTr1").not(".hide").each(function (i, v) {
@@ -318,6 +320,8 @@ function clearContract(){
 	$("#contractId").val(''); 
 	$("#contractNumber").val('');
 	$("#contractName").val(''); 
+	$("#purchaseId").val(''); 
+	$("#purchaseNumber").val('');
 }
 
 /**

src/main/webapp/yw/contract/purchaseNoContract/processContractPurchase.jsp

@@ -99,8 +99,8 @@
 			if (se == 1) {
 				$(".startTr1").not(".hide").each(function (i, v) {
 	                rs = $.validate({ name: "contractPurchaseDetailList[" + i + "].qty", model: [{type: "require", msg: "数量不能为空!"}] }) && rs;
-	                rs = $.validate({ name: "contractPurchaseDetailList[" + i + "].price", model: [{type: "require", msg: "价格不能为空!"}] }) && rs;
-	                rs = $.validate({ name: "contractPurchaseDetailList[" + i + "].cess", model: [{type: "require", msg: "税率不能为空!"}] }) && rs; 
+	                /* rs = $.validate({ name: "contractPurchaseDetailList[" + i + "].price", model: [{type: "require", msg: "价格不能为空!"}] }) && rs;
+	                rs = $.validate({ name: "contractPurchaseDetailList[" + i + "].cess", model: [{type: "require", msg: "税率不能为空!"}] }) && rs;  */
 	            });
 			}
             return rs;
@@ -346,8 +346,8 @@
                 <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">型号/规格</th>
                 <!-- <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;"> 供应商</th>   -->
                 <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">数量</th> 
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">单价</th>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">税率</th> 
+                <!-- <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">单价</th>
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">税率</th>  -->
             </tr>
 
 			<c:forEach items="${contractPurchaseDetailList}" var="items">
@@ -365,19 +365,22 @@
                     </td> 
                     <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
                         <input type="text" name="" class="input-width qty TextDisplay" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')" value="${items.qty}">
+                        <img align="bottom" style="cursor: pointer" class="substract1" src="${pageContext.request.contextPath}/liger/lib/ligerUI/skins/${sessionScope.css}/images/index/jian.png">
                     </td>
-                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+                    <%-- <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
                         <input type="text" name="" class="input-width price TextDisplay" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')" value="${items.price}">
                     </td>
                     <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
                         <input type="text" name="" class="input-width cess TextDisplay" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')" value="${items.cess}">
                         <img align="bottom" style="cursor: pointer" class="substract1" src="${pageContext.request.contextPath}/liger/lib/ligerUI/skins/${sessionScope.css}/images/index/jian.png">
-                    </td> 
+                    </td>  --%>
                 </tr>
             </c:forEach>
             
             <tr id="firstPoint"></tr>
-            <tr>
+            
+            <input type="hidden" id="totalAmount" name="contractPurchaseForm.totalAmount" value="${contractPurchaseForm.totalAmount}">
+            <%-- <tr>
                 <td class="l-table-edit-new" colspan="3" style="padding-right: 0px;padding-left: 0px;"></td>
                 <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;"> 合计(元)：</td>
                 <td class="l-table-edit-new" colspan="1"
@@ -390,7 +393,7 @@
 	                </c:choose> 
                 </td>
                 <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;"></td>
-            </tr>
+            </tr> --%>
 
         </table>
     </div>
@@ -426,13 +429,14 @@
         </td> 
         <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
             <input type="text" name="" class="input-width qty" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')">
+            <img align="bottom" style="cursor: pointer" class="substract1" src="${pageContext.request.contextPath}/liger/lib/ligerUI/skins/${sessionScope.css}/images/index/jian.png">
         </td>
-        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+        <%-- <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
             <input type="text" name="" class="input-width price" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')">
         </td>
         <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
             <input type="text" name="" class="input-width cess" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')">
              <img align="bottom" style="cursor: pointer" class="substract1" src="${pageContext.request.contextPath}/liger/lib/ligerUI/skins/${sessionScope.css}/images/index/jian.png">
-        </td>
+        </td> --%>
     </tr>
 </table>

src/main/webapp/yw/contract/purchaseNoContract/startContractPurchase.jsp

@@ -63,8 +63,8 @@
             rs = $.validate({name: "contractPurchaseForm.contractPurchaseName", model: [{type: "require", msg: "采购单名称不能为空!"}]}) && rs; 
             $(".startTr1").not(".hide").each(function (i, v) {
                 rs = $.validate({ name: "contractPurchaseDetailList[" + i + "].qty", model: [{type: "require", msg: "数量不能为空!"}] }) && rs;
-                rs = $.validate({ name: "contractPurchaseDetailList[" + i + "].price", model: [{type: "require", msg: "价格不能为空!"}] }) && rs;
-                rs = $.validate({ name: "contractPurchaseDetailList[" + i + "].cess", model: [{type: "require", msg: "税率不能为空!"}] }) && rs; 
+                /* rs = $.validate({ name: "contractPurchaseDetailList[" + i + "].price", model: [{type: "require", msg: "价格不能为空!"}] }) && rs;
+                rs = $.validate({ name: "contractPurchaseDetailList[" + i + "].cess", model: [{type: "require", msg: "税率不能为空!"}] }) && rs;  */
             });
             return rs;
         }
@@ -168,12 +168,13 @@
                 <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">型号/规格</th>
                 <!-- <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;"> 供应商</th>   -->
                 <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">数量</th> 
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">单价</th>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">税率</th> 
+                <!-- <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">单价</th>
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">税率</th>  -->
             </tr>
 
             <tr id="firstPoint"></tr>
-            <tr>
+             <input type="hidden" name="contractPurchaseForm.totalAmount" id="totalAmount">
+           <!--  <tr>
                 <td class="l-table-edit-new" colspan="3" style="padding-right: 0px;padding-left: 0px;"></td>
                 <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;"> 合计(元)：</td>
                 <td class="l-table-edit-new" colspan="1"
@@ -181,7 +182,7 @@
                     <input type="text" name="contractPurchaseForm.totalAmount" id="totalAmount" class="input-width" readonly>
                 </td>
                 <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;"></td>
-            </tr>
+            </tr> -->
 
         </table>
     </div>
@@ -215,13 +216,14 @@
         </td> 
         <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
             <input type="text" name="" class="input-width qty" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')">
+            <img align="bottom" style="cursor: pointer" class="substract1" src="${pageContext.request.contextPath}/liger/lib/ligerUI/skins/${sessionScope.css}/images/index/jian.png">
         </td>
-        <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+        <%-- <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
             <input type="text" name="" class="input-width price" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')">
         </td>
         <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
             <input type="text" name="" class="input-width cess" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')">
              <img align="bottom" style="cursor: pointer" class="substract1" src="${pageContext.request.contextPath}/liger/lib/ligerUI/skins/${sessionScope.css}/images/index/jian.png">
-        </td>
+        </td> --%>
     </tr>
 </table>

src/main/webapp/yw/contract/purchaseNoContract/viewContractPurchase.jsp

@@ -207,8 +207,8 @@
                 <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料名称</th>
                 <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">型号/规格</th>
                 <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">数量</th> 
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">单价</th>
-                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">税率</th> 
+                <!-- <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">单价</th>
+                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">税率</th>  -->
             </tr>
 
 			<c:forEach items="${contractPurchaseDetailList}" var="items">
@@ -225,19 +225,20 @@
                     </td>
                     <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
                         <input type="text" name="" class="input-width qty TextDisplay" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')" value="${items.qty}">
+                        <img align="bottom" style="cursor: pointer" class="substract1" src="${pageContext.request.contextPath}/liger/lib/ligerUI/skins/${sessionScope.css}/images/index/jian.png">
                     </td>
-                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+                    <%-- <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
                         <input type="text" name="" class="input-width price TextDisplay" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')" value="${items.price}">
                     </td>
                     <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
                         <input type="text" name="" class="input-width cess TextDisplay" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')" value="${items.cess}">
                         <img align="bottom" style="cursor: pointer" class="substract1" src="${pageContext.request.contextPath}/liger/lib/ligerUI/skins/${sessionScope.css}/images/index/jian.png">
-                    </td> 
+                    </td>  --%>
                 </tr>
             </c:forEach>
             
             <tr id="firstPoint"></tr>
-            <tr>
+            <%-- <tr>
                 <td class="l-table-edit-new" colspan="3" style="padding-right: 0px;padding-left: 0px;"></td>
                 <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;"> 合计(元)：</td>
                 <td class="l-table-edit-new" colspan="1"
@@ -245,7 +246,7 @@
                      ${contractPurchaseForm.totalAmount} 
                 </td>
                 <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;"></td>
-            </tr>
+            </tr> --%>
 
         </table>
     </div>

src/main/webapp/yw/contract/selectMaterialForContract.jsp

@@ -102,6 +102,16 @@ function searchByKword(){
 
 function f_select() {
 	var rows = grid.getCheckedRows();
+	var source = $("#dataSource").val(); 
+	if (source == "2") { // 采购申请 
+		var purchaseId = $("#contractPurchaseFormId").val();
+		var purchaseNumber = $("#contractPurchaseFormNumber").val();
+		// 为每一行添加采购申请单信息
+		for (var i = 0; i < rows.length; i++) {
+			rows[i].purchaseId = purchaseId;
+			rows[i].purchaseNumber = purchaseNumber;
+		}
+	}
 	return rows;
 }
 

src/main/webapp/yw/master1_contract/contractPurchaseOrder/createPurchaseOrder.jsp

@@ -170,7 +170,9 @@ body {
 								<input type="text" readonly="readonly" id="contractNumber" name="contractPurchaseOrder.contractNumber">
 								<input type="hidden" id="contractName" name="contractPurchaseOrder.contractName" value="">
 								<img id="searchContract" class="fee" onClick="selectContract()" src="${pageContext.request.contextPath}/images/sousuo.png" style="height: 20px; width: 20px; cursor: pointer;">
-								<input id="clearContractBtn" name="clearContractBtn" type="button" class="button_fj" value="清除" onclick="clearContract()"/>		
+								<input id="clearContractBtn" name="clearContractBtn" type="button" class="button_fj" value="清除" onclick="clearContract()"/>	
+								<input type="hidden" id="purchaseId" name="contractPurchaseOrder.purchaseId" value="${contractPurchaseOrder.purchaseId }" /> 
+				                <input type="hidden" id="purchaseNumber" name="contractPurchaseOrder.purchaseNumber" value="${contractPurchaseOrder.purchaseNumber }"/> 	
 							</td>  
 				        </tr> 
 						<tr>  

src/main/webapp/yw/master1_contract/contractPurchaseOrder/editPurchaseOrder.jsp

@@ -170,6 +170,8 @@ body {
 								<input type="hidden" id="contractName" name="contractPurchaseOrder.contractName" value="${contractPurchaseOrder.contractName }">
 								<img id="searchContract" class="fee" onClick="selectContract()" src="${pageContext.request.contextPath}/images/sousuo.png" style="height: 20px; width: 20px; cursor: pointer;">
 								<input id="clearContractBtn" name="clearContractBtn" type="button" class="button_fj" value="清除" onclick="clearContract()"/>
+								<input type="hidden" id="purchaseId" name="contractPurchaseOrder.purchaseId" value="${contractPurchaseOrder.purchaseId }" /> 
+				                <input type="hidden" id="purchaseNumber" name="contractPurchaseOrder.purchaseNumber" value="${contractPurchaseOrder.purchaseNumber }"/> 
 							</td> 
 				        </tr> 
 						<tr>  

src/main/webapp/yw/master1_contract/contractPurchaseOrder/infoPurchaseOrder.jsp

@@ -160,6 +160,8 @@ body {
 												<input type="hidden" id="contractName" name="contractPurchaseOrder.contractName" value="${contractPurchaseOrder.contractName }">
 												<img id="searchContract" class="fee" onClick="selectContract()" src="${pageContext.request.contextPath}/images/sousuo.png" style="height: 20px; width: 20px; cursor: pointer;">
 												<input id="clearContractBtn" name="clearContractBtn" type="button" class="button_fj" value="清除" onclick="clearContract()"/>
+												<input type="hidden" id="purchaseId" name="contractPurchaseOrder.purchaseId" value="${contractPurchaseOrder.purchaseId }" /> 
+				                				<input type="hidden" id="purchaseNumber" name="contractPurchaseOrder.purchaseNumber" value="${contractPurchaseOrder.purchaseNumber }"/> 
 						                    </c:when>
 						                    <c:otherwise>
 						                    	${contractPurchaseOrder.contractNumber }