【亿道外协 ： 接收SN序列号扫码绑定物料结果接口增加传参datecode 和转换器SN 】

src/main/java/com/uas/eis/serviceImpl/MESDataServiceImpl.java

@@ -858,12 +858,12 @@ public class MESDataServiceImpl implements MESDataService {
 
 		//校验是否存在绑定项
 		String insertSql = "INSERT INTO SNBINDMATERIAL (SM_ID,SM_SNCODE,SM_MAPRODCODE,SM_MACODE,SM_STEPCODE,SM_STEPNAME," +
-				"  SM_BINDDETNO,SM_FPRODCODE,SM_APRODCODE,SM_QTY,SM_BARCODE,SM_INDATE) " +
-				" VALUES (SNBINDMATERIAL_seq.nextval,?, ?, ?, ?, ?, ?, ?,?,?,?,sysdate)";
+				"  SM_BINDDETNO,SM_FPRODCODE,SM_APRODCODE,SM_QTY,SM_BARCODE,SM_INDATE,SM_DATECODE,SM_ADAPTERBOARD) " +
+				" VALUES (SNBINDMATERIAL_seq.nextval,?, ?, ?, ?, ?, ?, ?,?,?,?,sysdate,?,?)";
 		String insertHisSql = "INSERT INTO SNBINDMATERIAL_HIS (SM_ID,SM_SNCODE,SM_MAPRODCODE,SM_MACODE,SM_STEPCODE,SM_STEPNAME," +
-				"  SM_BINDDETNO,SM_FPRODCODE,SM_APRODCODE,SM_QTY,SM_BARCODE,SM_INDATE,SH_INDATE,SH_TYPE) " +
+				"  SM_BINDDETNO,SM_FPRODCODE,SM_APRODCODE,SM_QTY,SM_BARCODE,SM_INDATE,SH_INDATE,SH_TYPE,SM_DATECODE,SM_ADAPTERBOARD) " +
 				" select SM_ID,SM_SNCODE,SM_MAPRODCODE,SM_MACODE,SM_STEPCODE,SM_STEPNAME," +
-				"  SM_BINDDETNO,SM_FPRODCODE,SM_APRODCODE,SM_QTY,SM_BARCODE,SM_INDATE,SYSDATE,? from SNBINDMATERIAL " +
+				"  SM_BINDDETNO,SM_FPRODCODE,SM_APRODCODE,SM_QTY,SM_BARCODE,SM_INDATE,SYSDATE,?,SM_DATECODE,SM_ADAPTERBOARD from SNBINDMATERIAL " +
 				"  where SM_SNCODE=? and SM_MACODE=? and sm_fprodcode=? ";
 		List<Object[]> batchArgs = new ArrayList<>();
 		for (SNBindMaterialRequest.DetailDTO detail : detailList) {
@@ -875,12 +875,12 @@ public class MESDataServiceImpl implements MESDataService {
 					return ApiResponse.failRsp(ErrorMessage.BUSINESS_ILLEGAL.getCode(), requestId,
 							"绑定项编号（sm_fprodcode）：" +detail.getSm_fprodcode()+"，不在产品强制绑定项设置里面！");
 				}
-				cn = baseDao.getJdbcTemplate().queryForObject("select count(1) from SNBINDSET where ss_mothercode=? and ss_prodcode =?",Integer.class,
+				/*cn = baseDao.getJdbcTemplate().queryForObject("select count(1) from SNBINDSET where ss_mothercode=? and ss_prodcode =?",Integer.class,
 						mothercode,detail.getSm_aprodcode());
 				if(cn == 0){
 					return ApiResponse.failRsp(ErrorMessage.BUSINESS_ILLEGAL.getCode(), requestId,
 							"实际绑定编号（sm_aprodcode）：" +detail.getSm_aprodcode()+"，与绑定项设置"+detail.getSm_fprodcode()+"不一致");
-				}
+				}*/
 				batchArgs.add(new Object[]{
 						sncode,
 						mothercode,
@@ -891,7 +891,9 @@ public class MESDataServiceImpl implements MESDataService {
 						fprodcode,
 						detail.getSm_aprodcode(),
 						detail.getSm_qty(),
-						detail.getSm_barcode()
+						detail.getSm_barcode(),
+						detail.getSm_datecode(),
+						detail.getSm_adapterboard()
 				});
 				//是否原有绑定项，有则删除写历史表
 				cn = baseDao.getJdbcTemplate().queryForObject("select count(1)  from SNBINDMATERIAL WHERE SM_SNCODE=? and SM_MACODE=? and sm_fprodcode=?",Integer.class,sncode,macode,fprodcode);