添加删除不良明细按钮

WebContent/app/view/core/button/DeleteMakeBad.js

@@ -0,0 +1,17 @@
+/**
+ * 其它入库单转IQC单据
+ */
+Ext.define('erp.view.core.button.DeleteMakeBad',{
+    extend: 'Ext.Button',
+    alias: 'widget.erpDeleteMakeBadButton',
+    iconCls: 'x-button-icon-submit',
+    cls: 'x-btn-gray',
+    text: $I18N.common.button.erpDeleteMakeBadButton,
+    style: {
+        marginLeft: '10px'
+    },
+    width: 150,
+    initComponent : function(){
+        this.callParent(arguments);
+    }
+});

WebContent/resource/i18n/messages_zh_CN.js

@@ -66,6 +66,7 @@ var $I18N = {
 				erpLendTryButton: '确定借调',
 				erpLendTrimmerButton:'借调申请',
 				erpLendTrimButton : '借调',
+				erpDeleteMakeBadButton:'删除数据',
 				erpConnectcustomerButton:'关联客户',
 				erpSubmitApprovesButton:'提交(批准)',
 				erpDeleteAutoButton:'删除',

src/com/uas/mes/api/pdashop/controller/StartController.java

@@ -191,6 +191,16 @@ public class StartController extends BaseApiController{
 		return success(startService.DeletePreBarcode(caller,data));
 	}
 
+	@RequestMapping(value="/DeleteMakeBad.action" )
+	public ModelMap DeleteMakeBad (HttpServletRequest request,String caller,String data){
+		Employee employee = (Employee) request.getSession().getAttribute(
+				"employee");
+		if (employee == null)
+			BaseUtil.showError("会话已断开!");
+		return success(startService.DeleteMakeBad(caller,data));
+	}
+
+
 	@RequestMapping(value="/modifyMaProds.action" , method = RequestMethod.GET)
 	public Map<String, Object> modifyMaProds (HttpServletRequest request,String ma_code,String sc_code,String prods,String decode,String reportqty,String remark){
 		Employee employee = (Employee) request.getSession().getAttribute(

src/com/uas/mes/api/pdashop/service/Impl/PdashopServiceImpl.java

@@ -343,7 +343,7 @@ public class PdashopServiceImpl implements PdashopService{
 		if(baseDao.getFieldDataByCondition("employee","nvl(eM_allowprint,0)","em_code='"+SystemSession.getUser().getEm_code()+"'").toString().equals("0")){
 			throw new APIErrorException(APIErrorCode.BUSINESS_FAILED, "该账号没有打印条码的权限");
 		}
-		SqlRowList rs= baseDao.queryForRowSet("select SOURCECODE,pr_spec3_user,ma_pocode,pr_orispeccode,QTY,remark,makecode,OUTQTY,pr_code,pr_detail,pr_spec,to_char(sysdate,'yyyy-mm-dd hh24:Mi:ss')printdate from wip_lot left join  make on ma_code=makecode left join product on pr_code=ma_prodcode where LOTNO='"+lotno+"'");
+		SqlRowList rs= baseDao.queryForRowSet("select WLS_SOURCECODE,pr_spec3_user,ma_pocode,pr_orispeccode,QTY,remark,makecode,OUTQTY,pr_code,pr_detail,pr_spec,to_char(sysdate,'yyyy-mm-dd hh24:Mi:ss')printdate from wip_lot left join  make on ma_code=makecode left join product on pr_code=ma_prodcode left join WIP_LOT_SOURCE on wls_lotno=lotno where LOTNO='"+lotno+"'");
 		if(rs.next()){
 			Map<String,Object> mapr = new HashMap<String, Object>();
 			mapr.put("BAR_CODE", lotno);
@@ -355,12 +355,18 @@ public class PdashopServiceImpl implements PdashopService{
 			mapr.put("SALECODE","PI号:"+ rs.getString("ma_pocode"));
 			mapr.put("MA_QTY","工单数量:"+ rs.getString("MA_QTY"));
 			mapr.put("EM_CODE","报工人:"+ SystemSession.getUser().getEm_name());
-			mapr.put("SC_CODE","工位:"+ rs.getString("SOURCECODE"));
+			mapr.put("SC_CODE","工位:"+ rs.getString("WLS_SOURCECODE"));
 			mapr.put("PRINTDATE","时间:"+ rs.getString("printdate"));
 			mapr.put("PR_SPEC","规格型号:"+ rs.getString("pr_spec"));
 			mapr.put("PR_ORISPECCODE","规格1:"+ rs.getString("pr_orispeccode"));
 			mapr.put("PR_SPEC3_USER","规格3:"+ rs.getString("pr_spec3_user"));
 			mapr.put("OK","测试合格 口");
+			if(baseDao.getFieldDataByCondition("source","sc_wccode","sc_code='"+rs.getString("WLS_SOURCECODE")+"'").toString().equals("SMT车间")){
+				mapr.put("PCB","PCB:"+ baseDao.getFieldDataByCondition("makematerial left join product on " +
+						"pr_code=mm_prodcode","wm_concat(mm_prodcode)","mm_code='"+rs.getString("makecode")+"' and nvl(mm_oneuseqty,0)>0 and pr_detail like '%PCB%'"));
+				mapr.put("LED","LED:"+ baseDao.getFieldDataByCondition("makematerial left join product on " +
+						"pr_code=mm_prodcode","wm_concat(mm_prodcode)","mm_code='"+rs.getString("makecode")+"' and nvl(mm_oneuseqty,0)>0 and pr_detail like '%LED%'"));
+			}
 			rlist.add(mapr);
 		}
 		rs=baseDao.queryForRowSet("select * from beforehandprocess left join source on BHP_INMAN=sc_code where bhp_barcode='"+lotno+"'");

src/com/uas/mes/api/pdashop/service/Impl/StartServiceImpl.java

@@ -249,6 +249,19 @@ public class StartServiceImpl implements StartService{
 	}
 
 
+	@Override
+	public List<Map<String, Object>> DeleteMakeBad(String caller,String data) {
+		List<Map<Object, Object>> maps = BaseUtil.parseGridStoreToMaps(data);
+		List<String> sql= new ArrayList<>();
+		for (Map<Object, Object> m : maps) {
+			String sr_id=m.get("sr_id").toString();
+			sql.add("insert into STEPRECORD_BACKUP select * from steprecord where sr_id='"+sr_id+"'");
+			sql.add("delete from steprecord where sr_id='"+sr_id+"'");
+		}
+		baseDao.execute(sql);
+		return null;
+	}
+
 	@Override
 	public List<Map<String ,Object>> modifyMaProds(String ma_code, String sc_code, String prods,String decode,String reportqty,String remark) {
 		List<Map<String,Object>> rlist = new ArrayList<Map<String,Object>>();

src/com/uas/mes/api/pdashop/service/StartService.java

@@ -23,6 +23,7 @@ public interface StartService {
 
 	List<Map<String, Object>>DeleteBarcode(String caller,String data);
 	List<Map<String, Object>>DeletePreBarcode(String caller,String data);
+	List<Map<String, Object>>DeleteMakeBad(String caller,String data);
 
 	List<Map<String ,Object>> modifyMaProds(String ma_code, String sc_code, String prods,String decode,String reportqty,String remark);
 }