|
|
@@ -1210,13 +1210,13 @@ public class MESServiceImpl implements MESService {
|
|
|
// @add 20170614 抓取批次号成功之后更新出库单据的备料状态
|
|
|
updatePdaStatus(caller, pi_id);
|
|
|
if (baseDao.isDBSetting(caller, "ifBatchCodeNotChange") && baseDao.isDBSetting(caller, "autoPostIn")) {
|
|
|
- // 拨出单过帐后产生的拨入单批号不变，同一物料同仓库不能同时入两次相同的批号
|
|
|
+ // 拨出单过账后产生的拨入单批号不变，同一物料同仓库不能同时入两次相同的批号
|
|
|
SqlRowList rs1 = baseDao
|
|
|
.queryForRowSet("select count(1)n, wm_concat(pd_pdno)detno from (select pd_batchcode,pd_inwhcode,pd_prodcode,min(pd_pdno)pd_pdno,count(1)c from ProdIODetail where pd_piid="
|
|
|
+ pi_id + " and pd_batchcode<>' ' group by pd_batchcode,pd_inwhcode,pd_prodcode ) where c> 1");
|
|
|
if (rs1.next()) {
|
|
|
if (rs1.getInt("n") > 0) {
|
|
|
- return "拨出单过帐后产生的拨入单批号不变，同一物料同拨入仓库批号不能相同！行号：" + rs1.getString("detno");
|
|
|
+ return "拨出单过账后产生的拨入单批号不变，同一物料同拨入仓库批号不能相同！行号：" + rs1.getString("detno");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -1265,8 +1265,7 @@ public class MESServiceImpl implements MESService {
|
|
|
|
|
|
getTotal(pi_id, caller);
|
|
|
getQtyTotal(pi_id, caller);
|
|
|
- baseDao.updateByCondition("ProdInOut", "pi_statuscode='POSTED',pi_status='已过帐',pi_inoutman='"+employee.getEm_name()+"'," +
|
|
|
- "pi_date1=sysdate,pi_sendstatus='待上传'", "pi_id=" + pi_id);
|
|
|
+ baseDao.updateByCondition("ProdInOut", "pi_statuscode='POSTED',pi_status='已过账',pi_inoutman='"+employee.getEm_name()+"'," + "pi_date1=sysdate,pi_sendstatus='待上传'", "pi_id=" + pi_id);
|
|
|
if (!baseDao.isIn(caller)) {// 出库类单据过账时，根据批号抓取batch.ba_vendorrate到prodiodetail.pd_vendorrate
|
|
|
baseDao.execute("update prodiodetail set pd_vendorrate=(select ba_vendorrate from batch where ba_code=pd_batchcode"
|
|
|
+ " and ba_whcode =pd_whcode and ba_prodcode=pd_prodcode ) where pd_piid=" + pi_id + " and nvl(pd_vendorrate,0)=0");
|
|
|
@@ -2687,7 +2686,7 @@ public class MESServiceImpl implements MESService {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 产生冲销单并审核 发货单过帐/销售单审核 scm->prodinout->post->after scm->sale->audit->after
|
|
|
+ * 产生冲销单并审核 发货单过账/销售单审核 scm->prodinout->post->after scm->sale->audit->after
|
|
|
*
|
|
|
* @author ZhongYL
|
|
|
*/
|
