Merge remote-tracking branch 'origin/master'

src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java

@@ -168,7 +168,7 @@ public class InventoryMoveServiceImpl implements InventoryMoveService {
                          warehouseId,
                          group.partNo,
                          group.batchNo,
-                         group.originalLocationId,
+                         group.targetLocationId,
                          group.totalQty,
                          group.wdr,group.engChgLevel,
                          "IN");
@@ -181,6 +181,7 @@ public class InventoryMoveServiceImpl implements InventoryMoveService {
              for (HandlingUnit hu : handlingUnits) {
                  handlingUnitService.lambdaUpdate()
                      .set(HandlingUnit::getLocationId, dto.getTargetLocationId())
+                     .set(HandlingUnit::getWarehouseId, warehouseId)
                      .set(HandlingUnit::getModifiedDate, new Date())
                      .set(HandlingUnit::getModifiedBy, currentUser.getUserDisplay())
                      .set(HandlingUnit::getInStockFlag, "Y")