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-08-01 06:55:02 +08:00
parent 7b281cabb8
commit ada0aaf330
2 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
View File

@ -610,24 +610,24 @@ public class EmisWaybillController extends EmisBaseController
}
// @JacksonFilter(include= {
// "id","orderSn","billCode","orderStatus","waybillStatus",
// "orderType","sendDate","customerCode","customerName",
// "receiveName",
// "receiveCountry","receiveCountryName",
// "receiveProvince","receiveProvinceName",
// "receiveCity", "receiveCityName",
// "sendName",
// "sendCountry","sendCountryName",
// "sendProvince","sendProvinceName",
// "sendCity","sendCityName",
// "transLineType","transLineTypeName",
// "productType","productTypeName",
// "sendSiteName","destinationName",
// "dispatchUnderlingSiteName",
//
//
// },value= EmisWaybill.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@JacksonFilter(include= {
"id","orderSn","billCode","orderStatus","waybillStatus",
"orderType","sendDate","customerCode","customerName",
"receiveName",
"receiveCountry","receiveCountryName",
"receiveProvince","receiveProvinceName",
"receiveCity", "receiveCityName",
"sendName",
"sendCountry","sendCountryName",
"sendProvince","sendProvinceName",
"sendCity","sendCityName",
"transLineType","transLineTypeName",
"productType","productTypeName",
"sendSiteName","destinationName",
"dispatchUnderlingSiteName",
},value= EmisWaybill.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@GetMapping("/listSimple")
public TableDataInfo listSimple(EmisWaybill emisWaybill)
{
@ -636,6 +636,16 @@ public class EmisWaybillController extends EmisBaseController
// 设置通用权限查询参数
setPrivParams(emisWaybill);
// 如果不带查询本人开单的数据
if(StringUtils.isEmpty(emisWaybill.getBillCode())){
try {
emisWaybill.setRegisterManCode(getLoginUser().getUser().getEmpCode());
}catch(Exception ex){
ex.printStackTrace();
}
}
if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
String[] billCodeSortList = emisWaybill.getBillCode().split(",");
if(billCodeSortList.length>1){

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

@ -1027,7 +1027,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
emisWaybillSave.setId(oldEmisWaybill.getId());
// 公共计算部分
calcWayBillCommonInfo(emisWaybillSave,true);
calcWayBillCommonInfo(emisWaybillSave,oldEmisWaybill,true);
emisWaybillSave.preUpdate();
@ -1514,7 +1514,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
* @param isNew
* @throws EmisBizError
*/
private void calcWayBillCommonInfo(EmisWaybill emisWaybillSave,boolean isNew) throws EmisBizError {
private void calcWayBillCommonInfo(EmisWaybill emisWaybillSave,EmisWaybill oldWaybil,boolean isNew) throws EmisBizError {
String orderSn = WaybillHelper.genOrderSn();
@ -2290,7 +2290,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
}
// 公共计算部分
calcWayBillCommonInfo(emisWaybillSave,true);
calcWayBillCommonInfo(emisWaybillSave,null,true);
@ -2551,7 +2551,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 公共计算部分
emisWaybillSave.setId(oldEmisWaybill.getId());
calcWayBillCommonInfo(emisWaybillSave,false);
calcWayBillCommonInfo(emisWaybillSave,oldEmisWaybill,false);
emisWaybillSave.preUpdate();