|
|
@@ -57,7 +57,7 @@ public class XiangXServiceImpl implements XiangXService {
|
|
|
static final String GET_PROCESS_ALREADYDO_U="SELECT * FROM (select JPROCESSALREADYDOVIEW.* ,ROW_NUMBER() OVER(ORDER BY JN_DEALTIME DESC) RN from JPROCESSALREADYDOVIEW WHERE JP_CODEVALUE IS NOT NULL AND CONCAT(CONCAT(JP_NAME,'#'||JP_LAUNCHERNAME),'#'||JP_CODEVALUE) LIKE ? AND JN_DEALMANID= ?)WHERE RN<=? AND RN >= ? ORDER BY RN ASC";
|
|
|
|
|
|
@Override
|
|
|
- public Map<String, Object> postInOutInfo(int inOutId, String items, String master) {
|
|
|
+ public Map<String, Object> postInOutInfo(int inOutId, String items, String master, String dealDate) {
|
|
|
Map<String, Object> modelMap = new HashMap<String, Object>();
|
|
|
Employee employee = new Employee();
|
|
|
if(employee==null){
|
|
|
@@ -102,7 +102,7 @@ public class XiangXServiceImpl implements XiangXService {
|
|
|
//差异过账
|
|
|
try {
|
|
|
//更新单据日期为当前时间
|
|
|
- baseDao.updateByCondition("ProdInOut","pi_date=sysdate","pi_id="+inOutId);
|
|
|
+ baseDao.updateByCondition("ProdInOut","pi_date=to_date('"+dealDate+"','yyyy-MM-dd')","pi_id="+inOutId);
|
|
|
prodInOutService.postProdInOut(inOutId, caller.toString());
|
|
|
}catch (Exception e){
|
|
|
UpdateProdinOutLog(inOutId,false);
|
|
|
@@ -120,7 +120,7 @@ public class XiangXServiceImpl implements XiangXService {
|
|
|
}else {
|
|
|
try {
|
|
|
//更新单据日期为当前时间
|
|
|
- baseDao.updateByCondition("ProdInOut","pi_date=sysdate","pi_id="+inOutId);
|
|
|
+ baseDao.updateByCondition("ProdInOut","pi_date=to_date('"+dealDate+"','yyyy-MM-dd')","pi_id="+inOutId);
|
|
|
prodInOutService.postProdInOut(inOutId, caller.toString());
|
|
|
}catch (Exception e){
|
|
|
UpdateProdinOutLog(inOutId,false);
|