|
|
|
@ -337,6 +337,7 @@ public class PhxyyClient extends CommonHttpClient {
|
|
|
|
|
}
|
|
|
|
|
items.add(item);
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
|
|
|
|
|
log.error(e.getMessage(), e);
|
|
|
|
|
uploadLog.setStatus(3);
|
|
|
|
|
String errMsg = "提交失败,错误信息:" + e.getMessage();
|
|
|
|
@ -362,7 +363,13 @@ public class PhxyyClient extends CommonHttpClient {
|
|
|
|
|
for (IoCodeEntity codeDetaiEntity : ioCodeEntities) {
|
|
|
|
|
if (CollUtil.isNotEmpty(stockOrderDetailEntities)) {
|
|
|
|
|
for (IoOrderDetailBizEntity stockOrderDetailEntity : stockOrderDetailEntities) {
|
|
|
|
|
if (IntUtil.value(codeDetaiEntity.getRelId()) == IntUtil.value(stockOrderDetailEntity.getBindRlFk())
|
|
|
|
|
log.error("详情判断===1===");
|
|
|
|
|
log.error("{}", codeDetaiEntity.getRelId() == Long.valueOf(stockOrderDetailEntity.getBindRlFk()));
|
|
|
|
|
log.error("{}", StrUtil.trimToEmpty(codeDetaiEntity.getBatchNo()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo())));
|
|
|
|
|
log.error("{}", stockOrderDetailEntity.getBindRlFk().equals(codeDetaiEntity.getRelId()));
|
|
|
|
|
log.error("详情判断===2===");
|
|
|
|
|
|
|
|
|
|
if (stockOrderDetailEntity.getBindRlFk().equals(codeDetaiEntity.getRelId()+"")
|
|
|
|
|
&& StrUtil.trimToEmpty(codeDetaiEntity.getBatchNo()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo()))) {
|
|
|
|
|
IoOrderDetailBizEntity item = new IoOrderDetailBizEntity();
|
|
|
|
|
BeanUtils.copyProperties(stockOrderDetailEntity, item);
|
|
|
|
|