删除预加工条码

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

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

WebContent/resource/i18n/messages_zh_CN.js

@@ -113,6 +113,7 @@ var $I18N = {
 				erpCardLogImpButton:'打卡数据导入',
 				erpAttendDataComButton:'取数计算',
 				erpDeleteBarCodeButton:'删除条码',
+				erpDeletePreBarCodeButton:'删除条码',
 				erpCheckVendorUUButton:'一键获取',
 				erpExportArrayBomButton:'导出矩阵BOM',
 				erpCleanDetailButton:'清除明细',

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

@@ -182,6 +182,15 @@ public class StartController extends BaseApiController{
 		return success(startService.DeleteBarcode(caller,data));
 	}
 
+	@RequestMapping(value="/DeletePreBarcode.action" )
+	public ModelMap DeletePreBarcode (HttpServletRequest request,String caller,String data){
+		Employee employee = (Employee) request.getSession().getAttribute(
+				"employee");
+		if (employee == null)
+			BaseUtil.showError("会话已断开!");
+		return success(startService.DeletePreBarcode(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/StartServiceImpl.java

@@ -190,7 +190,32 @@ public class StartServiceImpl implements StartService{
 		}
 		return null;
 	}
-
+	@Override
+	public List<Map<String, Object>> DeletePreBarcode(String caller,String data) {
+		List<Map<Object, Object>> maps = BaseUtil.parseGridStoreToMaps(data);
+		List<String> sql= new ArrayList<>();
+		for (Map<Object, Object> m : maps) {
+			String bhp_id=m.get("bhp_id").toString();
+			String bhp_barcode=m.get("bhp_barcode").toString();
+			String reason=m.get("reason").toString();
+			if(reason==null||reason.equals("")){
+				BaseUtil.showError("刪除原因必填");
+			}
+			SqlRowList rs=baseDao.queryForRowSet("select MSS_MAKECODE from makesourcestock where MSS_BARCODE='"+bhp_barcode+"'");
+			if(rs.next()){
+				BaseUtil.showError(bhp_barcode+"已经上料工单"+rs.getString("MSS_MAKECODE")+"，不允许删除");
+			}else{
+				rs=baseDao.queryForRowSet("select * from BEFOREHANDPROCESS where bhp_id='"+bhp_id+"'");
+				if(rs.next()){
+					sql.add("update BEFOREHANDPROCESS set bhp_reason='"+reason+"' where bhp_id='"+bhp_id+"'");
+					sql.add("insert into BEFOREHANDPROCESS_BACKUP select * from BEFOREHANDPROCESS where bhp_id='"+bhp_id+"'");
+					sql.add("delete from BEFOREHANDPROCESS where bhp_id='"+bhp_id+"'");
+				}
+			}
+		}
+		baseDao.execute(sql);
+		return null;
+	}
 	@Override
 	public List<Map<String, Object>> DeleteBarcode(String caller,String data) {
 		List<Map<Object, Object>> maps = BaseUtil.parseGridStoreToMaps(data);

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

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