库存,预验收等bug修改

fencang
anthonyywj2 3 years ago
parent c371891881
commit 09217e3e32

@ -278,11 +278,11 @@ public class WareHouseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("warehouse/inout/submitOrderWeb") @GetMapping("warehouse/inout/submitOrderWeb")
public BaseResponse submitOrderWeb(AddOrderRequest orderEntity) { public BaseResponse submitOrderWeb(AddOrderRequest orderEntity) {
if (null != orderEntity) { // if (null != orderEntity) {
if (StrUtil.isBlank(orderEntity.getInvWarehouseCode())) { // if (StrUtil.isBlank(orderEntity.getInvWarehouseCode())) {
return ResultVOUtils.error(500, "分仓未选择"); // return ResultVOUtils.error(500, "分仓未选择");
} // }
} // }
orderService.updateOrderStatus(orderEntity.getOrderId(), ConstantStatus.ORDER_STATUS_PROCESS); orderService.updateOrderStatus(orderEntity.getOrderId(), ConstantStatus.ORDER_STATUS_PROCESS);
return saveOrderWeb(orderEntity); return saveOrderWeb(orderEntity);
} }

@ -96,9 +96,6 @@
<if test="invWarehouseCode != '' and invWarehouseCode != null"> <if test="invWarehouseCode != '' and invWarehouseCode != null">
AND invWarehouseCode = #{invWarehouseCode} AND invWarehouseCode = #{invWarehouseCode}
</if> </if>
<if test="invWarehouseCode == null">
AND invWarehouseCode is NULL
</if>
</where> </where>
</select> </select>

Loading…
Cancel
Save