增加加工反馈

gavel/src/main/java/com/gavel/kwell/controller/GpfkController.java

@@ -280,9 +280,21 @@ public class GpfkController extends BaseController {
     	}
     	
     }
+    
+    @RequestMapping(value = "/jgfk", method = RequestMethod.POST)
+    @ResponseBody
+    public Object jgfk(@RequestBody JSONObject param) {
+    	FkCondition condition = JSONObject.toJavaObject(param, FkCondition.class);
+    	FkVO gpfk  = gpfkService.zpfkUpgrade(condition);
+    	if(gpfk!=null) {
+    		return buildReturnData(gpfk);
+    	}
+    	return ThreadContext.getReturnData();
+    }
+    
     @RequestMapping(value = "/zpfk", method = RequestMethod.POST)
     @ResponseBody
-    public Object query(@RequestBody JSONObject param) {
+    public Object zpfk(@RequestBody JSONObject param) {
     	FkCondition condition = JSONObject.toJavaObject(param, FkCondition.class);
     	FkVO gpfk  = gpfkService.zpfkUpgrade(condition);
     	if(gpfk!=null) {

gavel/src/main/java/com/gavel/kwell/dao/impl/GpfkDaoImpl.java

@@ -1640,7 +1640,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
 	@Override
 	public List<WobomVO> queryWobomByWosnAndBzgx(String wosnid, String bzgx) {
 		SqlMap sqlMap = new SqlMap();
-	     sqlMap.append("select WOBOM_ID, WOBOM_XH, WOBOM_WOID, WOBOM_WLID, WOBOM_FFGX,");
+	     sqlMap.append("select WOBOM_ID,WOBOM_GJWL, WOBOM_XH, WOBOM_WOID, WOBOM_WLID, WOBOM_FFGX,");
 	     sqlMap.append("  WOBOM_DWYL, WOBOM_XQSL, WOBOM_XQRQ, WOBOM_SHL, WOBOM_SHZ, WOBOM_FFYZ,");
 	     sqlMap.append("  WOBOM_LLSL, WOBOM_CKSL, WOBOM_BZ, WOBOM_WHRID, WOBOM_WHR,");
 	     sqlMap.append("  WOBOM_WHSJ, WOBOM_CJRID, WOBOM_CJR, WOBOM_CJSJ, WOBOM_SYSVERSION,");

gavel/src/main/java/com/gavel/kwell/service/GpfkService.java

@@ -106,7 +106,7 @@ public interface GpfkService extends BaseEditService {
    	*  判断序列号类型
    */
   public String checkSnType(String snid);
-  
+  public FkVO jgfk(FkCondition fkCondition);
   public FkVO zpfk(FkCondition fkCondition);
   public FkVO jyfk(FkCondition fkCondition);
   public FkVO wxfk(FkCondition fkCondition);

gavel/src/main/java/com/gavel/kwell/utils/YymkFKEnum.java

@@ -12,7 +12,8 @@ public enum YymkFKEnum {
 
 	ZP("ZP", "1901000200"),
 	JY("JY","1901000400"),
-	WX("WX","1901000600");
+	WX("WX","1901000600"),
+	JG("JG","1901000800");
 	
 	private String id;
 	private String name;

gavel/src/main/resources/module.xml

@@ -6,6 +6,10 @@
     <version>1.0</version>
     
     <menu mkid="901000000" mkmc = "科威尔MES">
+    	<menu mkid="901001600" mkmc="加工反馈" url="kmes/jgfk/zpindex">
+            <print entity="com.gavel.kwell.vo.GpfkVO"/>
+            <mkcz czid = "21" czmc = "取消装配" value="Y"/>
+        </menu>
         <menu mkid="901000200" mkmc="装配反馈" url="kmes/gphy/zpindex">
             <print entity="com.gavel.kwell.vo.GpfkVO"/>
             <mkcz czid = "21" czmc = "取消装配" value="Y"/>
@@ -42,6 +46,8 @@
         </menu>
         <menu mkid="1901000600" mkmc="维修反馈" url="kmes/gpwx/index" gnlx="M">
         </menu>
+        <menu mkid="1901000800" mkmc="加工反馈" url="kmes/jgfk/index" gnlx="M">
+        </menu>
     </menu>
 	<menu fmkid="510020000" mkid="510020300"  mkmc="排产计划维护" url="kmes/pcjhk/index">
 			<print entity="com.gavel.kwell.vo.PcjhkVO"  type="M"/>

gavel/src/main/resources/templates/views/kmes/gphy/index.html

@@ -96,6 +96,11 @@
 						width: '20%',
 						align:"center"
 					},
+					{title: "关键物料", field: "gjwl", fieldType: "ftString", width: 80,formatter:function (value,index,row) {
+						var map = {"Y":"<span style='color: green'>是</span>","N": "否"};
+						var text  = map[value];
+						return text||"";
+					}},
 				]
 			]
 		/* 初始化工序 */
@@ -227,11 +232,11 @@
 				height: '100%',
 				width:"100%",
 				fitColumns: false,
-				// rowStyler:function(index,row){
-				// 	if(index<2){
-				// 		return 'background-color:#6293BB;color:#fff;';
-				// 	}
-				// },
+				rowStyler:function(index,row){
+				 	if(row.gjwl==''||row.gjwl==undefined||row.gjwl=='N'){
+				 		return 'background-color:#ADADAD;color:#fff;';
+				 	}
+				 },
 				columns:zpfk_columns,
 				data: that.tabdata
 			}