Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/managementcenter/materialProvided/entity/MaterialProvided.java

@@ -18,6 +18,7 @@ public class MaterialProvided extends DataEntity<MaterialProvided> {
 
 	private Integer serialNumber;//序号
 	private String planToBatch;//计划批次
+	private String planToBatchName;//计划批次名称
 	private String caseInformation;//分标信息
 	private String materialExtension;//物料加扩展
 	private String materialCode;//物料编码
@@ -104,12 +105,20 @@ public class MaterialProvided extends DataEntity<MaterialProvided> {
 	public Double getReferencePrice() {
 		return referencePrice;
 	}
+	@ExcelField(title="计划批次名称", align=2, sort=10)
+	public String getPlanToBatchName() {
+		return planToBatchName;
+	}
+
+	public void setPlanToBatchName(String planToBatchName) {
+		this.planToBatchName = planToBatchName;
+	}
 
 	public void setReferencePrice(Double referencePrice) {
 		this.referencePrice = referencePrice;
 	}
 
-	@ExcelField(title="版本名称", align=2, sort=10)
+	@ExcelField(title="版本名称", align=2, sort=11)
 	public String getVersionName() {
 		return versionName;
 	}

src/main/java/com/jeeplus/modules/sg/managementcenter/materialProvided/mapper/xml/MaterialProvidedMapper.xml

@@ -12,6 +12,7 @@
 		a.del_flag As "delFlag",
 		a.serialNumber As "serialNumber",
 		a.planToBatch As "planToBatch",
+		a.planToBatchName AS "planToBatchName",
 		a.caseInformation As "caseInformation",
 		a.materialExtension As "materialExtension",
 		a.materialCode As "materialCode",
@@ -93,6 +94,7 @@
 			del_flag,
 			serialNumber,
 			planToBatch,
+			planToBatchName,
 			caseInformation,
 			materialExtension,
 			materialCode,
@@ -113,6 +115,7 @@
 			#{delFlag},
 			#{serialNumber},
 			#{planToBatch},
+			#{planToBatchName},
 			#{caseInformation},
 			#{materialExtension},
 			#{materialCode},
@@ -137,6 +140,7 @@
 			del_flag,
 			serialNumber,
 			planToBatch,
+			planToBatchName,
 			caseInformation,
 			materialExtension,
 			materialCode,
@@ -159,6 +163,7 @@
 			#{item.delFlag},
 			#{item.serialNumber},
 			#{item.planToBatch},
+			#{item.planToBatchName},
 			#{item.caseInformation},
 			#{item.materialExtension},
 			#{item.materialCode},

src/main/java/com/jeeplus/modules/sg/managementcenter/materialProvided/util/ImportPro.java

@@ -29,12 +29,12 @@ public class ImportPro {
                 materialProvided.setSerialNumber(new Integer((String)importUtil.getCellValue(row,0)));
                 //计划批次
                 materialProvided.setPlanToBatch((String)importUtil.getCellValue(row,1));
+                //计划批次名称
+                materialProvided.setPlanToBatchName((String)importUtil.getCellValue(row,2));
                 //分标信息
-                materialProvided.setCaseInformation((String)importUtil.getCellValue(row,2));
-                //物料加扩展
-                materialProvided.setMaterialExtension((String)importUtil.getCellValue(row,3));
-                //物料编码
-                materialProvided.setMaterialCode((String)importUtil.getCellValue(row,4));
+                materialProvided.setCaseInformation((String)importUtil.getCellValue(row,3));
+//                物料编码
+//                materialProvided.setMaterialCode((String)importUtil.getCellValue(row,4));
                 //物料描述
                 materialProvided.setMaterialDescription((String)importUtil.getCellValue(row,6));
                 //扩展编码
@@ -45,6 +45,8 @@ public class ImportPro {
                 materialProvided.setMeasuringUnit((String)importUtil.getCellValue(row,9));
                 //参考概算价格
                 materialProvided.setReferencePrice(new Double((String)importUtil.getCellValue(row,10)));
+                //物料加扩展
+                materialProvided.setMaterialExtension(materialProvided.getMaterialCode()+materialProvided.getExtendedCode());
                 list.add(materialProvided);
             }
         }

src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -596,7 +596,10 @@ public class ProjectController extends BaseController {
 
 				}
 			}
-			j.setMsg( "已成功导入 "+sureSavePicking.size()+" 条领料表单记录."+str);
+			if (str.length()<=0){
+				str+="暂无通知！";
+			}
+			j.setMsg( "已成功导入 "+listPickRequisition.size()+" 条领料表单记录."+str);
 		} catch (Exception e) {
 			j.setSuccess(false);
 			j.setMsg("导入领料表单失败！失败信息："+e.getMessage());

src/main/webapp/webpage/modules/sg/managementcenter/materialProvided/materialProvided.js

@@ -143,6 +143,11 @@ $(document).ready(function() {
                        title: '计划批次'
                    }
                    ,{
+                       field: 'planToBatchName',
+                       width:200,
+                       title: '计划批次名称'
+                   }
+                   ,{
                        field: 'caseInformation',
                        width:160,
                        title: '分标信息'

src/main/webapp/webpage/modules/sg/managementcenter/materialProvided/materialProvidedForm.jsp

@@ -104,6 +104,15 @@
 						<form:input path="referencePrice" htmlEscape="false" class="form-control number"/>
 					</td>
 				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">计划批次名称：</label></td>
+					<td class="width-35">
+						<form:input path="planToBatchName" htmlEscape="false" class="form-control"/>
+					</td>
+					<td class="width-15 active"></td>
+					<td class="width-35">
+					</td>
+				</tr>
 		 	</tbody>
 		</table>
 	</form:form>