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

md

Browse Source
This commit is contained in:
linfso 2025-01-05 16:58:46 +08:00
parent 48362ce848
commit 73e836a73b
1 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
emis-api-web/src/main/java/com/xdadan/erp/apiweb/WarehouseInController.java
View File

@ -19,8 +19,10 @@ import com.xdadan.erp.common.core.page.TableDataInfo;
import com.xdadan.erp.common.enums.BusinessType; import com.xdadan.erp.common.enums.BusinessType;
import com.xdadan.erp.common.utils.poi.ExcelUtil; import com.xdadan.erp.common.utils.poi.ExcelUtil;
import com.xdadan.erp.emis.domain.EmisWarehouseIn; import com.xdadan.erp.emis.domain.EmisWarehouseIn;
import com.xdadan.erp.emis.domain.EmisWarehouseInBatch;
import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.domain.vo.WaybillOrder; import com.xdadan.erp.emis.domain.vo.WaybillOrder;
import com.xdadan.erp.emis.service.IEmisWarehouseInBatchService;
import com.xdadan.erp.emis.service.IEmisWarehouseInService; import com.xdadan.erp.emis.service.IEmisWarehouseInService;
import com.xdadan.erp.emis.service.IEmisWaybillService; import com.xdadan.erp.emis.service.IEmisWaybillService;
import com.xdadan.erp.emis.utils.WaybillHelper; import com.xdadan.erp.emis.utils.WaybillHelper;
@ -46,6 +48,9 @@ public class WarehouseInController extends BaseController
@Autowired @Autowired
private IEmisWarehouseInService emisWarehouseInService; private IEmisWarehouseInService emisWarehouseInService;
@Autowired
private IEmisWarehouseInBatchService emisWarehouseInBatchService;
@Autowired @Autowired
private IEmisWaybillService emisWaybillService; private IEmisWaybillService emisWaybillService;
@ -118,7 +123,6 @@ public class WarehouseInController extends BaseController
return getDataTable(list); return getDataTable(list);
} }
/** /**
* 获取进仓单详细信息 * 获取进仓单详细信息
*/ */
@ -156,4 +160,40 @@ public class WarehouseInController extends BaseController
} }
} }
@Log(title = "客户进仓单确认", businessType = BusinessType.UPDATE)
@RequestMapping("/cusConfirmWsIn")
public AjaxResult cusConfirmWsIn(@RequestBody EmisWarehouseInBatch emisWarehouseInBatch)
{
try {
// 部分确认
if(!StringUtils.isEmpty(emisWarehouseInBatch.getSerialNo())) {
return toAjax(emisWarehouseInBatchService.cusConfirmBatchWsInByOms(emisWarehouseInBatch));
}
// 全部确认
else{
return toAjax(emisWarehouseInBatchService.cusConfirmAllWsInByOms(emisWarehouseInBatch));
}
} catch (Exception ex) {
ex.printStackTrace();
return AjaxResult.error(ex.getMessage());
}
}
@Log(title = "异常上报", businessType = BusinessType.UPDATE)
@RequestMapping("/reportBatchWsInError")
public AjaxResult reportBatchWsInError(@RequestBody EmisWarehouseInBatch emisWarehouseInBatch)
{
try {
return toAjax(emisWarehouseInBatchService.updateAbnormalByOms(emisWarehouseInBatch));
} catch (Exception ex) {
ex.printStackTrace();
return AjaxResult.error(ex.getMessage());
}
}
} }