pda查询收货修改;
This commit is contained in:
+2
-3
@@ -143,7 +143,7 @@ public class StockReceiptOrderApplicationService {
|
|||||||
if (associationWarehouseCacheDO != null) {
|
if (associationWarehouseCacheDO != null) {
|
||||||
// 如果前端没有传仓库ID,则使用关联仓库ID;前端传了则以前端为准
|
// 如果前端没有传仓库ID,则使用关联仓库ID;前端传了则以前端为准
|
||||||
if (stockReceiptOrderDO.getWarehouseId() == null && associationWarehouseCacheDO.getWarehouseId() != null) {
|
if (stockReceiptOrderDO.getWarehouseId() == null && associationWarehouseCacheDO.getWarehouseId() != null) {
|
||||||
stockReceiptOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
|
// stockReceiptOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
@@ -1226,5 +1226,4 @@ public class StockReceiptOrderApplicationService {
|
|||||||
receiptMaterialDetailDO.setDistributeRuleCode(materialGoodsRulePO.getRuleCode());
|
receiptMaterialDetailDO.setDistributeRuleCode(materialGoodsRulePO.getRuleCode());
|
||||||
receiptMaterialDetailDO.setDistributeRuleName(materialGoodsRulePO.getRuleName());
|
receiptMaterialDetailDO.setDistributeRuleName(materialGoodsRulePO.getRuleName());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
+1
@@ -39,6 +39,7 @@ import com.mhd.wms.domain.shiftMaterialDetail.repository.mapper.ShiftMaterialDet
|
|||||||
import com.mhd.wms.domain.shiftMaterialDetail.repository.todo.ShiftMaterialDetailDO;
|
import com.mhd.wms.domain.shiftMaterialDetail.repository.todo.ShiftMaterialDetailDO;
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.scheduling.annotation.Scheduled;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
import org.springframework.util.CollectionUtils;
|
import org.springframework.util.CollectionUtils;
|
||||||
|
|||||||
Reference in New Issue
Block a user