aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-06-21 14:14:17 +08:00
parent bfe6b089da
commit 5a61196fe5
5 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -481,9 +481,11 @@ public class EmisBaseService {
* @param emisSmsSendRecord
*/
public void insertBizSmsMessage(EmisSmsSendRecord emisSmsSendRecord ){
// 检查是否唯一
int rst=emisSmsSendRecordMapper.checkUnique(emisSmsSendRecord);
if(rst==0) {
emisSmsSendRecordMapper.insertEmisSmsSendRecord(emisSmsSendRecord);
}
}
@ -807,6 +809,7 @@ public class EmisBaseService {
// 变动后余额
emisSiteSettleRecord.setBackBalance(curMoney);
emisSiteSettleRecord.setBackConfirmBalance(confirmMoney);
emisSiteSettleRecord.setDataFrom(WaybillHelper.getDataFrom());
// 插入明细记录
emisSiteSettleRecordMapper.insertEmisSiteSettleRecord(emisSiteSettleRecord);
@ -996,6 +999,7 @@ public class EmisBaseService {
*/
public void registerWaybillProblemInfo(EmisWaybillProblemInfo waybillProblemInfo){
waybillProblemInfo.setDataFrom(WaybillHelper.getDataFrom());
emisWaybillProblemInfoMapper.insertEmisWaybillProblemInfo(waybillProblemInfo);
String billCode=waybillProblemInfo.getBillCode();

3
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSitePrepaidRechargeServiceImpl.java
View File

@ -18,6 +18,7 @@ import com.xdadan.erp.emis.domain.EmisSiteSettleRecord;
import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.service.EmisBaseService;
import com.xdadan.erp.emis.utils.WaybillHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.xdadan.erp.emis.domain.EmisSitePrepaidRecharge;
@ -150,7 +151,7 @@ public class EmisSitePrepaidRechargeServiceImpl extends EmisBaseService implemen
EmisSite emisSite = getSiteByCode(emisSitePrepaidRecharge.getRechargeSiteCode());
emisSiteSettleRecord.setCenterCode(emisSite.getParentSiteCode());
emisSiteSettleRecord.setDataFrom("pc");
emisSiteSettleRecord.setDataFrom(WaybillHelper.getDataFrom());
emisSiteSettleRecord.setOperataDate(new Date());
emisSiteSettleRecord.setFinanceDate(new Date());
emisSiteSettleRecord.setBlCenter("1");

5
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
View File

@ -704,10 +704,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
emisTmsScanRecord.setRecordManPhone(getCurrentUser().getPhonenumber());
emisTmsScanRecord.setRecordSiteCode(getCurrentUser().getOwnerSiteCode());
String dataFrom=ServletUtils.getRequest().getHeader("dataFrom");
log.error("==dataFrom==>",dataFrom);
emisTmsScanRecord.setDataFrom(dataFrom);
emisTmsScanRecord.setDataFrom(WaybillHelper.getDataFrom());
emisTmsScanRecord.setStatus("1");
emisTmsScanRecord.preInsert();
}

6
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -488,6 +488,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
emisWaybillSave.setRegisterDate(new Date());
}
if(isNew) {
emisWaybillSave.setDataFrom(WaybillHelper.getDataFrom());
}
if(emisWaybillSave.getFreight().floatValue()<=0.0f){
@ -827,7 +831,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
emisSiteSettleRecord.setSiteCode(emisWaybillSave.getSendSiteCode());
emisSiteSettleRecord.setSiteName(emisWaybillSave.getSendSiteName());
emisSiteSettleRecord.setDataFrom("开单");
emisSiteSettleRecord.setDataFrom(WaybillHelper.getDataFrom());
emisSiteSettleRecord.setOperataDate(new Date());
emisSiteSettleRecord.setFinanceDate(new Date());
emisSiteSettleRecord.setBlCenter("1");

14
emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
View File

@ -8,15 +8,18 @@ import com.alibaba.fastjson.serializer.SerializerFeature;
import com.alibaba.fastjson.serializer.ValueFilter;
import com.xdadan.erp.common.utils.DBUtil;
import com.xdadan.erp.common.utils.HTTPHelperV3;
import com.xdadan.erp.common.utils.ServletUtils;
import com.xdadan.erp.common.utils.StringUtils;
import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import lombok.extern.slf4j.Slf4j;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.HashMap;
import java.util.Map;
@Slf4j
public class WaybillHelper {
// 5位小数
@ -222,6 +225,17 @@ public class WaybillHelper {
return str;
}
public static String getDataFrom(){
String dataFrom="None";
try{
dataFrom= ServletUtils.getRequest().getHeader("dataFrom");
log.error("==dataFrom==>",dataFrom);
}catch (Exception ex){
ex.printStackTrace();
}
return dataFrom;
}