修复判断导入对比bug

purchase^2
zhengmingliang 3 years ago
parent 930ec3db5d
commit 2a08b60f3b

@ -640,11 +640,11 @@ public class OrderDetailController {
return ResultVOUtils.error(500, "所选单据类型不一致!");
}
if (orderEntity.getInvStorageCode().equals(erpOrderEntities.get(i).getLocStorageCode())) {
if (!orderEntity.getInvStorageCode().equals(erpOrderEntities.get(i).getLocStorageCode())) {
return ResultVOUtils.error(500, "扫码单据与业务单据当前仓库不一致!");
}
if (orderEntity.getInvWarehouseCode().equals(erpOrderEntities.get(i).getInvWarehouseCode())) {
if (!orderEntity.getInvWarehouseCode().equals(erpOrderEntities.get(i).getInvWarehouseCode())) {
return ResultVOUtils.error(500, "扫码单据与业务单据当前分库不一致!");
}

@ -294,6 +294,7 @@
<if test="tyshxydm != null">tyshxydm=#{tyshxydm},</if>
<if test="zczbhhzbapzbh != null">zczbhhzbapzbh=#{zczbhhzbapzbh},</if>
<if test="cpms != null">cpms=#{cpms},</if>
<if test="sptm != null">sptm=#{sptm},</if>
<if test="measname != null">measname=#{measname},</if>
<if test="allowNoBatch != null">allowNoBatch=#{allowNoBatch},</if>
<if test="allowNoExpire != null">allowNoExpire=#{allowNoExpire},</if>

Loading…
Cancel
Save