|
|
@@ -709,24 +709,27 @@ public class PdaSMTServiceImpl implements PdaSMTService {
|
|
|
rs2 = baseDao.queryForRowSet("select wm_concat(psl_repcode)repcode ,count(1) cn ,max(psl_prodcode)psl_prodcode,count(1) cn ,max(psl_feeder) psl_feeder, max(psl_baseqty) psl_baseqty from productsmtlocation "
|
|
|
+"where psl_psid=? and psl_location=? and psl_table=?",map.get("PS_ID"),location,map.get("DL_TABLE"));
|
|
|
if(rs2.next()){
|
|
|
- Boolean isBarcodePre = isOurBarcode(dsl_barcode);
|
|
|
- int usable = 0;
|
|
|
- if(dsl_barcode == null || ("").equals(dsl_barcode) || !isBarcodePre){
|
|
|
- baseDao.execute("update devsmtlocation set dsl_status=-1,dsl_cutman='"+SystemSession.getUser().getEm_name()+"',dsl_invalidtime=sysdate"
|
|
|
- +" where dsl_id = ?",dsl_id);
|
|
|
- usable = 1;
|
|
|
- //记录下料
|
|
|
- if(!isBarcodePre){
|
|
|
- if(dsl_barcode != null && !("").equals(dsl_barcode)){
|
|
|
- baseDao.execute(INSERT_SMTLOG,SystemSession.getUser().getEm_name(),"接料","接料成功,料卷:"+dsl_barcode+"下料,"+(("product").equals(type)?"物料编号":"料卷号")+":"+bar_code+"上料",linecode,location,0,ps_prodcode,"料卷"+dsl_barcode,map.get("DL_TABLE"),has_make == -1?ma_code:"");
|
|
|
- }else{
|
|
|
- baseDao.execute(INSERT_SMTLOG,SystemSession.getUser().getEm_name(),"接料","接料成功,物料编号:"+dsl_prodcode+"下料,"+(("product").equals(type)?"物料编号":"料卷号")+":"+bar_code+"上料",linecode,location,0,ps_prodcode,"物料"+dsl_prodcode,map.get("DL_TABLE"),has_make == -1?ma_code:"");
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+// Boolean isBarcodePre = isOurBarcode(dsl_barcode);
|
|
|
+// int usable = 0;
|
|
|
+// if(dsl_barcode == null || ("").equals(dsl_barcode) || !isBarcodePre){
|
|
|
+// baseDao.execute("update devsmtlocation set dsl_status=-1,dsl_cutman='"+SystemSession.getUser().getEm_name()+"',dsl_invalidtime=sysdate"
|
|
|
+// +" where dsl_id = ?",dsl_id);
|
|
|
+//
|
|
|
+// //记录下料
|
|
|
+// if(!isBarcodePre){
|
|
|
+// if(dsl_barcode != null && !("").equals(dsl_barcode)){
|
|
|
+//
|
|
|
+// }else{
|
|
|
+// baseDao.execute(INSERT_SMTLOG,SystemSession.getUser().getEm_name(),"接料","接料成功,物料编号:"+dsl_prodcode+"下料,"+(("product").equals(type)?"物料编号":"料卷号")+":"+bar_code+"上料",linecode,location,0,ps_prodcode,"物料"+dsl_prodcode,map.get("DL_TABLE"),has_make == -1?ma_code:"");
|
|
|
+// }
|
|
|
+// }
|
|
|
+// }
|
|
|
+ int usable = 1;
|
|
|
if(("barcode").equals(type)){
|
|
|
baseDao.execute("update barcode set bar_place = ? where bar_code = ?",ma_code,bar_code);
|
|
|
}
|
|
|
+ baseDao.execute(INSERT_SMTLOG,SystemSession.getUser().getEm_name(),"接料","接料成功,"+(("product").equals(type)?"物料编号":"料卷号")+":"+bar_code+"上料",linecode,location,0,ps_prodcode,"料卷"+dsl_barcode,map.get("DL_TABLE"),has_make == -1?ma_code:"");
|
|
|
+
|
|
|
baseDao.execute("insert into devsmtlocation (dsl_id,dsl_maid,dsl_makecode,dsl_location,dsl_prodcode,dsl_repcode,dsl_fespec,dsl_baseqty,dsl_table,dsl_needqty,dsl_getqty,dsl_remainqty,dsl_barcode,dsl_linecode,dsl_devcode,dsl_status, dsl_indate,dsl_inman,dsl_ifcheck,dsl_fprodcode,dsl_usable,dsl_validtime)values( DEVSMTLOCATION_SEQ.nextval,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,sysdate,?,?,?,?,?)",map.get("MA_ID"),ma_code,location,pr_code,rs2.getString("repcode"),
|
|
|
rs2.getString("psl_feeder"),rs2.getDouble("psl_baseqty"),map.get("DL_TABLE"),rs2.getDouble("psl_baseqty")*ma_qty,
|
|
|
bar_remain,bar_remain,(("product").equals(type)?"":bar_code),linecode,map.get("DL_DECODE"),SystemSession.getUser().getEm_name(),0,rs2.getString("psl_prodcode"),usable,(usable==1)?Timestamp.valueOf(DateUtil.currentDateString(Constant.YMD_HMS)):"");
|
