|
|
@@ -376,6 +376,9 @@ public class MESServiceImpl implements MESService {
|
|
|
+ ") and nvl(mm_materialstatus,' ')=' ' and mm_oneuseqty>0 and mm_oneuseqty*ma_qty<=mm_qty+0.1)");
|
|
|
sqls.add("update make set ma_canmadeqty=0 where ma_id in (" + ma_id + ") and NVL(ma_canmadeqty,0)<=0");
|
|
|
baseDao.execute(sqls);
|
|
|
+ if(!baseDao.isDBSetting(picaller,"AllowPost")){
|
|
|
+ return ApiResponse.successRsp("0",requestId,piclass+":"+picode+",请在ERP查看并手工过账!");
|
|
|
+ }
|
|
|
String s = postProdInOut(piid, picaller, employee);
|
|
|
logger.info("完工过账信息=="+s);
|
|
|
if (s!=null){
|
|
|
@@ -827,28 +830,39 @@ public class MESServiceImpl implements MESService {
|
|
|
baseDao.execute(sqls);
|
|
|
refreshTurnQty(maid,0);
|
|
|
setBackQty(String.valueOf(maid),0);
|
|
|
+ Employee employee = baseDao.getJdbcTemplate().queryForObject("select * from employee where em_code=?",
|
|
|
+ new BeanPropertyRowMapper<Employee>(Employee.class), "mes");
|
|
|
int count = baseDao.getCount("select count(1) from prodiodetail where pd_piid=" + llpiid);
|
|
|
if (count<=0){
|
|
|
baseDao.deleteById("prodinout","pi_id",llpiid);
|
|
|
- }
|
|
|
- Employee employee = baseDao.getJdbcTemplate().queryForObject("select * from employee where em_code=?",
|
|
|
- new BeanPropertyRowMapper<Employee>(Employee.class), "mes");
|
|
|
- String s = postProdInOut(bcpiid, bccaller, employee);
|
|
|
- logger.info("S=="+s);
|
|
|
- if (s!=null){
|
|
|
- return ApiResponse.successRsp("0",requestId,bcpiclass+":"+bccode+",过账失败,请在ERP重新过账!");
|
|
|
+ if(!baseDao.isDBSetting(llcaller,"AllowPost")){
|
|
|
+ return ApiResponse.successRsp("0",requestId,bcpiclass+":"+bccode+ ",请在ERP查看并过账!");
|
|
|
+ }
|
|
|
+ String s = postProdInOut(bcpiid, bccaller, employee);
|
|
|
+ logger.info("S=="+s);
|
|
|
+ if (s!=null){
|
|
|
+ return ApiResponse.successRsp("0",requestId,bcpiclass+":"+bccode+",过账失败,请在ERP重新过账!");
|
|
|
+ }else {
|
|
|
+ return ApiResponse.successRsp("0",requestId,bcpiclass+":"+bccode+ ",请在ERP查看!");
|
|
|
+ }
|
|
|
}else {
|
|
|
- if (count>0) {
|
|
|
- String s1 = postProdInOut(llpiid, llcaller, employee);
|
|
|
- logger.info("S1==" + s1);
|
|
|
- refreshTurnQty(maid,0);
|
|
|
- setBackQty(String.valueOf(maid),0);
|
|
|
- if (s1 != null) {
|
|
|
- return ApiResponse.successRsp("0", requestId, llpiclass+":" + llcode + ",过账失败,请在ERP重新过账!");
|
|
|
- }
|
|
|
+ if(!baseDao.isDBSetting(llcaller,"AllowPost")){
|
|
|
+ return ApiResponse.successRsp("0",requestId,llpiclass+":"+llcode+","+bcpiclass+":"+bccode+ ",请在ERP查看并手工过账!");
|
|
|
+ }
|
|
|
+ String s = postProdInOut(bcpiid, bccaller, employee);
|
|
|
+ logger.info("S=="+s);
|
|
|
+ if (s!=null){
|
|
|
+ return ApiResponse.successRsp("0",requestId,bcpiclass+":"+bccode+",过账失败,请在ERP重新过账!");
|
|
|
}
|
|
|
+ String s1 = postProdInOut(llpiid, llcaller, employee);
|
|
|
+ logger.info("S1==" + s1);
|
|
|
+ refreshTurnQty(maid,0);
|
|
|
+ setBackQty(String.valueOf(maid),0);
|
|
|
+ if (s1 != null) {
|
|
|
+ return ApiResponse.successRsp("0", requestId, llpiclass+":" + llcode + ",过账失败,请在ERP重新过账!");
|
|
|
+ }
|
|
|
+ return ApiResponse.successRsp("0",requestId,llpiclass+":"+llcode+","+bcpiclass+":"+bccode+ ",请在ERP查看!");
|
|
|
}
|
|
|
- return ApiResponse.successRsp("0",requestId,llpiclass+":"+llcode+","+bcpiclass+":"+bccode+ ",请在ERP查看!");
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -1000,23 +1014,31 @@ public class MESServiceImpl implements MESService {
|
|
|
int count = baseDao.getCount("select count(1) from prodiodetail where pd_piid=" + tlid);
|
|
|
if (count<=0){
|
|
|
baseDao.deleteById("prodinout","pi_id",tlid);
|
|
|
- }
|
|
|
- if (count>0) {
|
|
|
+ if(!baseDao.isDBSetting(tlcaller,"AllowPost")){
|
|
|
+ return ApiResponse.successRsp("0",requestId,bcpiclass+":"+code+ ",请在ERP查看并手工过账!");
|
|
|
+ }
|
|
|
+ String s = postProdInOut(id, bccaller, employee);
|
|
|
+ logger.info("S=="+s);
|
|
|
+ if (s!=null){
|
|
|
+ return ApiResponse.successRsp("0",requestId,bcpiclass+":"+code+",过账失败,请在ERP重新过账!");
|
|
|
+ }
|
|
|
+ return ApiResponse.successRsp("0",requestId,bcpiclass+":"+code+",请在ERP查看!");
|
|
|
+ }else {
|
|
|
+ if(!baseDao.isDBSetting(tlcaller,"AllowPost")){
|
|
|
+ return ApiResponse.successRsp("0",requestId,tlpiclass+":"+tlcode+","+bcpiclass+":"+code+",请在ERP查看并手工过账!");
|
|
|
+ }
|
|
|
String s1 = postProdInOut(tlid, tlcaller, employee);
|
|
|
logger.info("S1==" + s1);
|
|
|
- if (s1 != null) {
|
|
|
- return ApiResponse.successRsp("0", requestId, tlpiclass+":" + tlcode + ",过账失败,请在ERP重新过账!");
|
|
|
+ if (s1 != null){
|
|
|
+ return ApiResponse.successRsp("0", requestId, tlpiclass+":"+tlcode+","+bcpiclass+":"+code+",过账失败,请在ERP重新过账!");
|
|
|
}
|
|
|
+ String s = postProdInOut(id, bccaller, employee);
|
|
|
+ logger.info("S=="+s);
|
|
|
+ if (s!=null){
|
|
|
+ return ApiResponse.successRsp("0",requestId,tlpiclass+":"+tlcode+","+bcpiclass+":"+code+",过账失败,请在ERP重新过账!");
|
|
|
+ }
|
|
|
+ return ApiResponse.successRsp("0",requestId,tlpiclass+":"+tlcode+","+bcpiclass+":"+code+",请在ERP查看!");
|
|
|
}
|
|
|
- String s = postProdInOut(id, bccaller, employee);
|
|
|
- logger.info("S=="+s);
|
|
|
- if (s!=null){
|
|
|
- return ApiResponse.successRsp("0",requestId,bcpiclass+":"+code+",过账失败,请在ERP重新过账!");
|
|
|
- }
|
|
|
- if (count<=0) {
|
|
|
- return ApiResponse.successRsp("0",requestId,bcpiclass+":"+code+",请在ERP查看!");
|
|
|
- }
|
|
|
- return ApiResponse.successRsp("0",requestId,tlpiclass+":"+tlcode+","+bcpiclass+":"+code+",请在ERP查看!");
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -1466,15 +1488,20 @@ public class MESServiceImpl implements MESService {
|
|
|
sqls.add("update prodinout set pi_whcode='"+warehouses[0]+"',pi_whname='"+warehouses[1]+"' where pi_id="+llpiid);
|
|
|
}
|
|
|
baseDao.execute(sqls);
|
|
|
+ refreshTurnQty(maid,0);
|
|
|
+ setBackQty(String.valueOf(maid),0);
|
|
|
+ if(!baseDao.isDBSetting(llcaller,"AllowPost")){
|
|
|
+ return ApiResponse.successRsp("0",requestId,llpiclass + ":" + llcode + ",请在ERP查看并手工过账!");
|
|
|
+ }
|
|
|
Employee employee = baseDao.getJdbcTemplate().queryForObject("select * from employee where em_code=?",
|
|
|
new BeanPropertyRowMapper<Employee>(Employee.class), "mes");
|
|
|
String s = postProdInOut(llpiid, llcaller, employee);
|
|
|
+ if (s!=null){
|
|
|
+ return ApiResponse.successRsp("0", requestId, llpiclass + ":" + llcode + ",过账失败,请在ERP重新过账!");
|
|
|
+ }
|
|
|
refreshTurnQty(maid,0);
|
|
|
setBackQty(String.valueOf(maid),0);
|
|
|
- if (s != null) {
|
|
|
- return ApiResponse.successRsp("0", requestId, llpiclass+":" + llcode + ",过账失败,请在ERP重新过账!");
|
|
|
- }
|
|
|
- return ApiResponse.successRsp("0",requestId,llpiclass+":"+llcode+",请在ERP查看!");
|
|
|
+ return ApiResponse.successRsp("0", requestId, llpiclass + ":" + llcode + ",请在ERP查看!");
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -1571,10 +1598,13 @@ public class MESServiceImpl implements MESService {
|
|
|
}
|
|
|
baseDao.execute(sqls);
|
|
|
Employee employee = baseDao.getJdbcTemplate().queryForObject("select * from employee where em_code=?", new BeanPropertyRowMapper<Employee>(Employee.class), "mes");
|
|
|
+ if(!baseDao.isDBSetting(tlcaller,"AllowPost")){
|
|
|
+ return ApiResponse.successRsp("0",requestId,tlpiclass+":"+tlcode+",请在ERP查看并手工过账!");
|
|
|
+ }
|
|
|
String s = postProdInOut(tlid, tlcaller, employee);
|
|
|
- logger.info("S==" + s);
|
|
|
- if (s != null) {
|
|
|
- return ApiResponse.successRsp("0", requestId, tlpiclass+":" + tlcode + ",过账失败,请在ERP重新过账!");
|
|
|
+ logger.info("s=="+s);
|
|
|
+ if (s!=null) {
|
|
|
+ return ApiResponse.successRsp("0", requestId, tlpiclass + ":" + tlcode + ",过账失败,请在ERP重新过账!");
|
|
|
}
|
|
|
return ApiResponse.successRsp("0",requestId,tlpiclass+":"+tlcode+",请在ERP查看!");
|
|
|
}
|